| hg-reviewers |
Same as previous commit, but for mq (I would have folded them, but
test-check-commit doesn't like "revert/mq" as a topic and I couldn't
think of a better one).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/mq.py (6 lines) | |||
| M | tests/test-mq.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| self.ui.warn(_('error removing undo: %s\n') % | self.ui.warn(_('error removing undo: %s\n') % | ||||
| stringutil.forcebytestr(inst)) | stringutil.forcebytestr(inst)) | ||||
| def backup(self, repo, files, copy=False): | def backup(self, repo, files, copy=False): | ||||
| # backup local changes in --force case | # backup local changes in --force case | ||||
| for f in sorted(files): | for f in sorted(files): | ||||
| absf = repo.wjoin(f) | absf = repo.wjoin(f) | ||||
| if os.path.lexists(absf): | if os.path.lexists(absf): | ||||
| absorig = scmutil.origpath(self.ui, repo, absf) | |||||
| self.ui.note(_('saving current version of %s as %s\n') % | self.ui.note(_('saving current version of %s as %s\n') % | ||||
| (f, scmutil.origpath(self.ui, repo, f))) | (f, os.path.relpath(absorig))) | ||||
| absorig = scmutil.origpath(self.ui, repo, absf) | |||||
| if copy: | if copy: | ||||
| util.copyfile(absf, absorig) | util.copyfile(absf, absorig) | ||||
| else: | else: | ||||
| util.rename(absf, absorig) | util.rename(absf, absorig) | ||||
| def printdiff(self, repo, diffopts, node1, node2=None, files=None, | def printdiff(self, repo, diffopts, node1, node2=None, files=None, | ||||
| fp=None, changes=None, opts=None): | fp=None, changes=None, opts=None): | ||||
| if opts is None: | if opts is None: | ||||
| [255] | [255] | ||||
| apply force, should discard changes in hello, but not bye | apply force, should discard changes in hello, but not bye | ||||
| $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups' | $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups' | ||||
| applying empty | applying empty | ||||
| creating directory: $TESTTMP/forcepush/.hg/origbackups | creating directory: $TESTTMP/forcepush/.hg/origbackups | ||||
| saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt | saving current version of hello.txt as .hg/origbackups/hello.txt | ||||
| patching file hello.txt | patching file hello.txt | ||||
| committing files: | committing files: | ||||
| hello.txt | hello.txt | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| now at: empty | now at: empty | ||||
| $ hg st | $ hg st | ||||
| M bye.txt | M bye.txt | ||||