--- a/hgext/mq.py Wed Oct 14 02:06:54 2015 -0400
+++ b/hgext/mq.py Wed Oct 14 03:30:27 2015 -0400
@@ -1097,10 +1097,10 @@
def checklocalchanges(self, repo, force=False, refresh=True):
excsuffix = ''
if refresh:
- excsuffix = ', refresh first'
+ excsuffix = ', qrefresh first'
# plain versions for i18n tool to detect them
- _("local changes found, refresh first")
- _("local changed subrepos found, refresh first")
+ _("local changes found, qrefresh first")
+ _("local changed subrepos found, qrefresh first")
return checklocalchanges(repo, force, excsuffix)
_reserved = ('series', 'status', 'guards', '.', '..')
@@ -1454,7 +1454,7 @@
return ret[0]
top = self.applied[-1].name
if ret[0] and ret[0] > 1:
- msg = _("errors during apply, please fix and refresh %s\n")
+ msg = _("errors during apply, please fix and qrefresh %s\n")
self.ui.write(msg % top)
else:
self.ui.write(_("now at: %s\n") % top)
@@ -1549,7 +1549,7 @@
tobackup = set(a + m + r) & tobackup
if keepchanges and tobackup:
- raise error.Abort(_("local changes found, refresh first"))
+ raise error.Abort(_("local changes found, qrefresh first"))
self.backup(repo, tobackup)
repo.dirstate.beginparentchange()
for f in a:
@@ -1604,9 +1604,9 @@
self.checktoppatch(repo)
(top, patchfn) = (self.applied[-1].node, self.applied[-1].name)
if repo.changelog.heads(top) != [top]:
- raise error.Abort(_("cannot refresh a revision with children"))
+ raise error.Abort(_("cannot qrefresh a revision with children"))
if not repo[top].mutable():
- raise error.Abort(_("cannot refresh public revision"),
+ raise error.Abort(_("cannot qrefresh public revision"),
hint=_('see "hg help phases" for details'))
cparents = repo.changelog.parents(top)
@@ -1814,7 +1814,7 @@
ctx = repo[cparents[0]]
repo.dirstate.rebuild(ctx.node(), ctx.manifest())
self.savedirty()
- self.ui.warn(_('refresh interrupted while patch was popped! '
+ self.ui.warn(_('qrefresh interrupted while patch was popped! '
'(revert --all, qpush to recover)\n'))
raise
finally:
--- a/tests/test-mq-eol.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-eol.t Wed Oct 14 03:30:27 2015 -0400
@@ -61,7 +61,7 @@
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh eol.diff
+ errors during apply, please fix and qrefresh eol.diff
[2]
$ hg qpop
popping eol.diff
@@ -73,7 +73,7 @@
applying eol.diff
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh eol.diff
+ errors during apply, please fix and qrefresh eol.diff
[2]
$ hg qpop
popping eol.diff
@@ -170,7 +170,7 @@
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh patch1
+ errors during apply, please fix and qrefresh patch1
[2]
$ hg qpop
popping patch1
@@ -193,7 +193,7 @@
1 out of 1 hunks FAILED -- saving rejects to file a.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh patch1
+ errors during apply, please fix and qrefresh patch1
[2]
$ hg qpop
popping patch1
--- a/tests/test-mq-missingfiles.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-missingfiles.t Wed Oct 14 03:30:27 2015 -0400
@@ -45,7 +45,7 @@
2 out of 2 hunks FAILED -- saving rejects to file b.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh changeb
+ errors during apply, please fix and qrefresh changeb
[2]
Display added files:
@@ -98,7 +98,7 @@
b not tracked!
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh changebb
+ errors during apply, please fix and qrefresh changebb
[2]
$ cat a
a
@@ -150,7 +150,7 @@
1 out of 1 hunks FAILED -- saving rejects to file b.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh changeb
+ errors during apply, please fix and qrefresh changeb
[2]
$ hg st
? b.rej
--- a/tests/test-mq-qfold.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qfold.t Wed Oct 14 03:30:27 2015 -0400
@@ -59,7 +59,7 @@
$ echo d >> a
$ hg qfold p3
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg diff -c .
@@ -181,7 +181,7 @@
$ rm -f .hg/last-message.txt
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: emulating unexpected abort
[255]
$ test -f .hg/last-message.txt
@@ -232,7 +232,7 @@
transaction abort!
rollback completed
note: commit message saved in .hg/last-message.txt
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1
[255]
$ cat .hg/last-message.txt
--- a/tests/test-mq-qgoto.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qgoto.t Wed Oct 14 03:30:27 2015 -0400
@@ -63,7 +63,7 @@
$ echo f >> c
$ hg qgoto 1
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg qgoto 1 -f
popping bug141421
--- a/tests/test-mq-qpush-exact.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qpush-exact.t Wed Oct 14 03:30:27 2015 -0400
@@ -204,7 +204,7 @@
1 out of 1 hunks FAILED -- saving rejects to file fp0.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh p0
+ errors during apply, please fix and qrefresh p0
[2]
$ cat fp0
cp0-bad
@@ -231,7 +231,7 @@
1 out of 1 hunks FAILED -- saving rejects to file fp1.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh p1
+ errors during apply, please fix and qrefresh p1
[2]
$ cat fp1
cp1-bad
--- a/tests/test-mq-qpush-fail.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qpush-fail.t Wed Oct 14 03:30:27 2015 -0400
@@ -233,22 +233,22 @@
[255]
$ echo a >> a
$ hg qpop --keep-changes
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg revert -qa a
$ rm a
$ hg qpop --keep-changes
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg rm -A a
$ hg qpop --keep-changes
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg revert -qa a
$ echo b > b
$ hg add b
$ hg qpop --keep-changes
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg forget b
$ echo d > d
@@ -303,7 +303,7 @@
committing manifest
committing changelog
patch failed, rejects left in working directory
- errors during apply, please fix and refresh p3
+ errors during apply, please fix and qrefresh p3
[2]
$ cat a.orig
a
@@ -449,7 +449,7 @@
now at: p2
$ hg st b
$ hg --config mq.keepchanges=1 qpush --exact
- abort: local changes found, refresh first
+ abort: local changes found, qrefresh first
[255]
$ hg revert -qa a
$ hg qpop
--- a/tests/test-mq-qrefresh-replace-log-message.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qrefresh-replace-log-message.t Wed Oct 14 03:30:27 2015 -0400
@@ -139,7 +139,7 @@
$ rm -f .hg/last-message.txt
$ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: emulating unexpected abort
[255]
$ test -f .hg/last-message.txt
@@ -188,7 +188,7 @@
transaction abort!
rollback completed
note: commit message saved in .hg/last-message.txt
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1
[255]
$ cat .hg/last-message.txt
@@ -231,7 +231,7 @@
transaction abort!
rollback completed
note: commit message saved in .hg/last-message.txt
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1
[255]
@@ -269,7 +269,7 @@
====
transaction abort!
rollback completed
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1
[255]
@@ -311,7 +311,7 @@
====
transaction abort!
rollback completed
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1
[255]
--- a/tests/test-mq-qrefresh.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qrefresh.t Wed Oct 14 03:30:27 2015 -0400
@@ -503,7 +503,7 @@
> bar'
transaction abort!
rollback completed
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: username 'foo\nbar' contains a newline!
[255]
$ rm a
@@ -519,7 +519,7 @@
$ hg qrefresh -u ' '
transaction abort!
rollback completed
- refresh interrupted while patch was popped! (revert --all, qpush to recover)
+ qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: empty username!
[255]
$ cat .hg/patches/a
--- a/tests/test-mq-safety.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-safety.t Wed Oct 14 03:30:27 2015 -0400
@@ -25,7 +25,7 @@
$ hg phase --public qbase
$ echo babar >> foo
$ hg qref
- abort: cannot refresh public revision
+ abort: cannot qrefresh public revision
(see "hg help phases" for details)
[255]
$ hg revert -a
@@ -35,7 +35,7 @@
(see "hg help phases" for details)
[255]
$ hg qfold bar
- abort: cannot refresh public revision
+ abort: cannot qrefresh public revision
(see "hg help phases" for details)
[255]
$ hg revert -a
@@ -81,7 +81,7 @@
abort: popping would remove a revision not managed by this patch queue
[255]
$ hg qrefresh
- abort: cannot refresh a revision with children
+ abort: cannot qrefresh a revision with children
[255]
$ hg tip --template '{rev} {desc}\n'
3 append quux
--- a/tests/test-mq-subrepo.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-subrepo.t Wed Oct 14 03:30:27 2015 -0400
@@ -243,7 +243,7 @@
$ hg -R sub update 0000
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg qpop
- abort: local changed subrepos found, refresh first
+ abort: local changed subrepos found, qrefresh first
[255]
$ hg revert sub
reverting subrepo sub
@@ -262,7 +262,7 @@
$ hg -R sub update 0000
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg qpush
- abort: local changed subrepos found, refresh first
+ abort: local changed subrepos found, qrefresh first
[255]
$ hg revert sub
reverting subrepo sub
--- a/tests/test-mq.t Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq.t Wed Oct 14 03:30:27 2015 -0400
@@ -869,7 +869,7 @@
1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
- errors during apply, please fix and refresh bar
+ errors during apply, please fix and qrefresh bar
[2]
$ hg st
? foo