Mercurial > hg-stable
changeset 8513:b9308af35ba2
merge with mpm
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 19 May 2009 01:17:54 +0200 |
| parents | b87e5ad94229 (current diff) 90f86a5330bb (diff) |
| children | 252232621165 |
| files | |
| diffstat | 7 files changed, 31 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/changelog.py Tue May 19 00:06:19 2009 +0200 +++ b/mercurial/changelog.py Tue May 19 01:17:54 2009 +0200 @@ -209,6 +209,10 @@ if "\n" in user: raise error.RevlogError(_("username %s contains a newline") % repr(user)) + + # strip trailing whitespace and leading and trailing empty lines + desc = '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n') + user, desc = encoding.fromlocal(user), encoding.fromlocal(desc) if date:
--- a/mercurial/cmdutil.py Tue May 19 00:06:19 2009 +0200 +++ b/mercurial/cmdutil.py Tue May 19 01:17:54 2009 +0200 @@ -1231,6 +1231,7 @@ edittext.append("") # Empty line between message and comments. edittext.append(_("HG: Enter commit message." " Lines beginning with 'HG:' are removed.")) + edittext.append("HG: Leave message empty to abort commit.") edittext.append("HG: --") edittext.append(_("HG: user: %s") % ctx.user()) if ctx.p2():
--- a/mercurial/localrepo.py Tue May 19 00:06:19 2009 +0200 +++ b/mercurial/localrepo.py Tue May 19 01:17:54 2009 +0200 @@ -769,25 +769,18 @@ def commit(self, files=None, text="", user=None, date=None, match=None, force=False, editor=False, extra={}): - wlock = lock = None - if extra.get("close"): - force = True - if files: - files = list(set(files)) - - ret = None wlock = self.wlock() try: p1, p2 = self.dirstate.parents() - if (not force and p2 != nullid and - (match and (match.files() or match.anypats()))): + if (not force and p2 != nullid and match and + (match.files() or match.anypats())): raise util.Abort(_('cannot partially commit a merge ' '(do not specify files or patterns)')) if files: modified, removed = [], [] - for f in files: + for f in sorted(set(files)): s = self.dirstate[f] if s in 'nma': modified.append(f) @@ -799,9 +792,9 @@ else: changes = self.status(match=match) - if (not (changes[0] or changes[1] or changes[2]) - and not force and p2 == nullid and - self[None].branch() == self['.'].branch()): + if (not force and not extra.get("close") and p2 == nullid + and not (changes[0] or changes[1] or changes[2]) + and self[None].branch() == self['.'].branch()): self.ui.status(_("nothing changed\n")) return None @@ -810,26 +803,28 @@ if f in ms and ms[f] == 'u': raise util.Abort(_("unresolved merge conflicts " "(see hg resolve)")) + wctx = context.workingctx(self, (p1, p2), text, user, date, extra, changes) - ret = self.commitctx(wctx, editor, True) - ms.reset() + if editor: + wctx._text = editor(self, wctx, + changes[1], changes[0], changes[2]) + ret = self.commitctx(wctx, True) - # update dirstate + # update dirstate and mergestate for f in changes[0] + changes[1]: self.dirstate.normal(f) for f in changes[2]: self.dirstate.forget(f) self.dirstate.setparents(ret) + ms.reset() return ret finally: - if ret == None: - self.dirstate.invalidate() # didn't successfully commit wlock.release() - def commitctx(self, ctx, editor=None, error=False): + def commitctx(self, ctx, error=False): """Add a new revision to current repository. Revision information is passed via the context argument. @@ -838,7 +833,7 @@ """ tr = lock = None - remove = ctx.removed() + removed = ctx.removed() p1, p2 = ctx.p1(), ctx.p2() m1 = p1.manifest().copy() m2 = p2.manifest() @@ -868,39 +863,21 @@ self.ui.warn(_("trouble committing %s!\n") % f) raise else: - remove.append(f) - - updated, added = [], [] - for f in sorted(changed): - if f in m1 or f in m2: - updated.append(f) - else: - added.append(f) + removed.append(f) # update manifest m1.update(new) - removed = [f for f in sorted(remove) if f in m1 or f in m2] - removed1 = [] - - for f in removed: - if f in m1: - del m1[f] - removed1.append(f) + removed = [f for f in sorted(removed) if f in m1 or f in m2] + drop = [f for f in removed if f in m1] + for f in drop: + del m1[f] mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), - p2.manifestnode(), (new, removed1)) + p2.manifestnode(), (new, drop)) - text = ctx.description() - if editor: - text = editor(self, ctx, added, updated, removed) - - lines = [line.rstrip() for line in text.rstrip().splitlines()] - while lines and not lines[0]: - del lines[0] - text = '\n'.join(lines) - + # update changelog self.changelog.delayupdate() - n = self.changelog.add(mn, changed + removed, text, trp, - p1.node(), p2.node(), + n = self.changelog.add(mn, changed + removed, ctx.description(), + trp, p1.node(), p2.node(), user, ctx.date(), ctx.extra().copy()) p = lambda: self.changelog.writepending() and self.root or "" self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
--- a/tests/test-commit.out Tue May 19 00:06:19 2009 +0200 +++ b/tests/test-commit.out Tue May 19 01:17:54 2009 +0200 @@ -1,6 +1,4 @@ % commit date test -transaction abort! -rollback completed abort: empty commit message abort: impossible time zone offset: 4444444 abort: invalid date: '1\t15.1' @@ -110,12 +108,11 @@ HG: Enter commit message. Lines beginning with 'HG:' are removed. +HG: Leave message empty to abort commit. HG: -- HG: user: test HG: branch 'default' HG: added added HG: changed changed HG: removed removed -transaction abort! -rollback completed abort: empty commit message
--- a/tests/test-import.out Tue May 19 00:06:19 2009 +0200 +++ b/tests/test-import.out Tue May 19 01:17:54 2009 +0200 @@ -32,8 +32,6 @@ updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch -transaction abort! -rollback completed abort: empty commit message % import of plain diff should be ok with message requesting all changes @@ -150,8 +148,6 @@ updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin -transaction abort! -rollback completed abort: empty commit message % hg export in email, should use patch header requesting all changes
--- a/tests/test-keyword.out Tue May 19 00:06:19 2009 +0200 +++ b/tests/test-keyword.out Tue May 19 01:17:54 2009 +0200 @@ -112,10 +112,6 @@ A b % default keyword expansion including commit hook % interrupted commit should not change state or run commit hook -a -b -transaction abort! -rollback completed abort: empty commit message % status A a @@ -281,8 +277,6 @@ ignore $Id$ a % interrupted commit should not change state -transaction abort! -rollback completed abort: empty commit message % status M a
--- a/tests/test-record.out Tue May 19 00:06:19 2009 +0200 +++ b/tests/test-record.out Tue May 19 01:17:54 2009 +0200 @@ -53,9 +53,7 @@ % select files but no hunks diff --git a/empty-rw b/empty-rw new file mode 100644 -examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort! -rollback completed -abort: empty commit message +examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message changeset: -1:000000000000 tag: tip