Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 7072:4e0d54fbd34f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show added files as "added" in editor commit message (issue 1330)
author Patrick Mezard <pmezard@gmail.com>
date Thu, 09 Oct 2008 14:16:17 +0200
parents 40d105a12cac
children ccbd39cad3c3
comparison
equal deleted inserted replaced
7071:643c751e60b2 7072:4e0d54fbd34f
858 self.ui.warn(_("trouble committing %s!\n") % f) 858 self.ui.warn(_("trouble committing %s!\n") % f)
859 raise 859 raise
860 else: 860 else:
861 remove.append(f) 861 remove.append(f)
862 862
863 updated, added = [], []
864 for f in util.sort(changed):
865 if f in m1 or f in m2:
866 updated.append(f)
867 else:
868 added.append(f)
869
863 # update manifest 870 # update manifest
864 m1.update(new) 871 m1.update(new)
865 removed = [] 872 removed = []
866 873
867 for f in util.sort(remove): 874 for f in util.sort(remove):
886 edittext.append("HG: user: %s" % user) 893 edittext.append("HG: user: %s" % user)
887 if p2 != nullid: 894 if p2 != nullid:
888 edittext.append("HG: branch merge") 895 edittext.append("HG: branch merge")
889 if branchname: 896 if branchname:
890 edittext.append("HG: branch '%s'" % util.tolocal(branchname)) 897 edittext.append("HG: branch '%s'" % util.tolocal(branchname))
891 edittext.extend(["HG: changed %s" % f for f in changed]) 898 edittext.extend(["HG: added %s" % f for f in added])
899 edittext.extend(["HG: changed %s" % f for f in updated])
892 edittext.extend(["HG: removed %s" % f for f in removed]) 900 edittext.extend(["HG: removed %s" % f for f in removed])
893 if not changed and not remove: 901 if not added and not updated and not removed:
894 edittext.append("HG: no files changed") 902 edittext.append("HG: no files changed")
895 edittext.append("") 903 edittext.append("")
896 # run editor in the repository root 904 # run editor in the repository root
897 olddir = os.getcwd() 905 olddir = os.getcwd()
898 os.chdir(self.root) 906 os.chdir(self.root)