Mercurial > hg > gitweb

changeset 2798:2d60c682a081

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.update: allow to suppress commit reminder.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 07 Aug 2006 17:22:17 -0700
parents a3c6e7888abf
children bd8a9a94139f
files mercurial/localrepo.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Aug 06 17:27:05 2006 +0200
+++ b/mercurial/localrepo.py	Mon Aug 07 17:22:17 2006 -0700
@@ -1698,7 +1698,8 @@
         return newheads - oldheads + 1
 
     def update(self, node, allow=False, force=False, choose=None,
-               moddirstate=True, forcemerge=False, wlock=None, show_stats=True):
+               moddirstate=True, forcemerge=False, wlock=None,
+               show_stats=True, remind=True):
         pl = self.dirstate.parents()
         if not force and pl[1] != nullid:
             raise util.Abort(_("outstanding uncommitted merges"))
@@ -1987,8 +1988,9 @@
                                     "  hg merge %s\n"
                                     % (self.changelog.rev(p1),
                                         self.changelog.rev(p2))))
-                else:
-                    self.ui.status(_("(branch merge, don't forget to commit)\n"))
+                elif remind:
+                    self.ui.status(_("(branch merge, don't forget "
+                                     "to commit)\n"))
             elif failedmerge:
                 self.ui.status(_("There are unresolved merges with"
                                  " locally modified files.\n"))