Mercurial > hg
changeset 8700:a96b049075a8
mq: drop unneeded files args for commit
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 01 Jun 2009 13:51:21 -0500 |
| parents | f364cc1d98c4 |
| children | 02a12835b17e |
| files | hgext/mq.py tests/test-mq-missingfiles.out |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Jun 01 13:51:21 2009 -0500 +++ b/hgext/mq.py Mon Jun 01 13:51:21 2009 -0500 @@ -471,7 +471,7 @@ # the first patch in the queue is never a merge patch # pname = ".hg.patches.merge.marker" - n = repo.commit(None, '[mq]: merge marker', user=None, force=1) + n = repo.commit(None, '[mq]: merge marker', force=1) self.removeundo(repo) self.applied.append(statusentry(hex(n), pname)) self.applied_dirty = 1 @@ -597,7 +597,7 @@ files = patch.updatedir(self.ui, repo, files) match = cmdutil.matchfiles(repo, files or []) - n = repo.commit(files, message, ph.user, ph.date, match=match, + n = repo.commit(None, message, ph.user, ph.date, match=match, force=True) if n is None: @@ -763,7 +763,7 @@ if hasattr(msg, '__call__'): msg = msg() commitmsg = msg and msg or ("[mq]: %s" % patchfn) - n = repo.commit(commitfiles, commitmsg, user, date, match=match, force=True) + n = repo.commit(None, commitmsg, user, date, match=match, force=True) if n is None: raise util.Abort(_("repo commit failed")) try: @@ -1284,7 +1284,7 @@ try: # might be nice to attempt to roll back strip after this patchf.rename() - n = repo.commit(match.files(), message, user, ph.date, + n = repo.commit(None, message, user, ph.date, match=match, force=1) self.applied.append(statusentry(hex(n), patchfn)) except: @@ -1470,7 +1470,7 @@ msg += "\n\nPatch Data:\n" text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and "\n".join(ar) + '\n' or "") - n = repo.commit(None, text, user=None, force=1) + n = repo.commit(None, text, force=1) if not n: self.ui.warn(_("repo commit failed\n")) return 1
--- a/tests/test-mq-missingfiles.out Mon Jun 01 13:51:21 2009 -0500 +++ b/tests/test-mq-missingfiles.out Mon Jun 01 13:51:21 2009 -0500 @@ -33,7 +33,6 @@ 1 out of 1 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) b: No such file or directory -b not tracked! patch failed, rejects left in working dir errors during apply, please fix and refresh changeb ? b.rej