Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 1922:6d50d6189269
ui: output the number of file updated/merged/removed/... on update
add a note for people to remember commiting after a merge.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 13 Mar 2006 08:56:59 +0100 |
| parents | 6569651a4f1e |
| children | 36c6e4c3ff43 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Mar 12 20:34:09 2006 +0100 +++ b/mercurial/localrepo.py Mon Mar 13 08:56:59 2006 +0100 @@ -1634,6 +1634,7 @@ self.dirstate.update([f], 'n') # merge the tricky bits + failedmerge = [] files = merge.keys() files.sort() xp1 = hex(p1) @@ -1644,6 +1645,7 @@ ret = self.merge3(f, my, other, xp1, xp2) if ret: err = True + failedmerge.append(f) util.set_exec(self.wjoin(f), flag) if moddirstate: if branch_merge: @@ -1677,6 +1679,16 @@ if moddirstate: self.dirstate.setparents(p1, p2) + + stat = ((len(get), _("updated")), + (len(merge) - len(failedmerge), _("merged")), + (len(remove), _("removed")), + (len(failedmerge), _("unresolved"))) + note = ", ".join([_("%d files %s") % s for s in stat]) + self.ui.note("%s\n" % note) + if moddirstate and branch_merge: + self.ui.note(_("(branch merge, don't forget to commit)\n")) + return err def merge3(self, fn, my, other, p1, p2):