2010-09-26 22:43:21 +04:00
|
|
|
Test that qpush cleans things up if it doesn't complete
|
|
|
|
|
|
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
|
|
$ echo "mq=" >> $HGRCPATH
|
|
|
|
$ hg init repo
|
|
|
|
$ cd repo
|
|
|
|
$ echo foo > foo
|
|
|
|
$ hg ci -Am 'add foo'
|
|
|
|
adding foo
|
|
|
|
$ touch untracked-file
|
|
|
|
$ echo 'syntax: glob' > .hgignore
|
|
|
|
$ echo '.hgignore' >> .hgignore
|
|
|
|
$ hg qinit
|
|
|
|
|
|
|
|
test qpush on empty series
|
|
|
|
|
|
|
|
$ hg qpush
|
|
|
|
no patches in series
|
|
|
|
$ hg qnew patch1
|
|
|
|
$ echo >> foo
|
|
|
|
$ hg qrefresh -m 'patch 1'
|
|
|
|
$ hg qnew patch2
|
|
|
|
$ echo bar > bar
|
|
|
|
$ hg add bar
|
|
|
|
$ hg qrefresh -m 'patch 2'
|
2014-09-20 19:06:57 +04:00
|
|
|
$ hg qnew --config 'mq.plain=true' -U bad-patch
|
2010-09-26 22:43:21 +04:00
|
|
|
$ echo >> foo
|
|
|
|
$ hg qrefresh
|
|
|
|
$ hg qpop -a
|
|
|
|
popping bad-patch
|
|
|
|
popping patch2
|
|
|
|
popping patch1
|
|
|
|
patch queue now empty
|
2014-10-15 23:35:59 +04:00
|
|
|
$ $PYTHON -c 'print "\xe9"' > message
|
2010-09-26 22:43:21 +04:00
|
|
|
$ cat .hg/patches/bad-patch >> message
|
|
|
|
$ mv message .hg/patches/bad-patch
|
localrepo: use changelog.hasnode instead of self.__contains__
Before this patch, releasing the store lock implies the actions below, when
the transaction is aborted:
1. "commithook()" scheduled in "localrepository.commit()" is invoked
2. "changectx.__init__()" is invoked via "self.__contains__()"
3. specified ID is examined against "repo.dirstate.p1()"
4. validation function is invoked in "dirstate.p1()"
In subsequent patches, "dirstate.invalidate()" invocations for
discarding changes are replaced with "dirstateguard", but discarding
changes by "dirstateguard" is executed after releasing the store lock:
resources are acquired in "wlock => dirstateguard => store lock" order,
and are released in reverse order.
This may cause that "dirstate.p1()" still refers to the changeset to be
rolled-back at (4) above: pushing multiple patches by "hg qpush" is
a typical case.
When releasing the store lock, such changesets are:
- not contained in "repo.changelog", if it is reloaded from
".hg/00changelog.i", as that file was already truncated by
"transaction.abort()"
- still contained in it, otherwise
(this "dirty read" problem is discussed in "Transaction Plan"
http://mercurial.selenic.com/wiki/TransactionPlan)
Validation function shows "unknown working parent" warning in the
former case, but reloading "repo.changelog" depends on the timestamp
of ".hg/00changelog.i". This causes occasional test failures.
In the case of scheduled "commithook()", it just wants to examine
whether "node ID" of committed changeset is still valid or not. Other
examinations implied in "changectx.__init__()" are meaningless.
To avoid showing the "unknown working parent" warning irregularly, this
patch uses "changelog.hasnode()" instead of "node in self" to examine
existence of committed changeset.
2015-05-07 06:07:10 +03:00
|
|
|
$ cat > $TESTTMP/wrapplayback.py <<EOF
|
|
|
|
> import os
|
|
|
|
> from mercurial import extensions, transaction
|
|
|
|
> def wrapplayback(orig,
|
|
|
|
> journal, report, opener, vfsmap, entries, backupentries,
|
transaction: avoid file stat ambiguity only for files in blacklist
Advancing mtime by os.utime() fails for EPERM, if the target file is
owned by another. 0d920bcb0fd1 and related changes made some code
paths give advancing mtime up in such case, to fix issue5418.
This causes file stat ambiguity (again), if it is owned by another.
https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan
To avoid file stat ambiguity in such case, especially for
.hg/dirstate, c75c7b3e3284 made vfs.rename() copy the target file, and
advance mtime of renamed one again, if EPERM (see issue5584 for detail).
But straightforward "copy if EPERM" isn't reasonable for truncation of
append-only files at rollbacking, because rollbacking might cost much
for truncation of many filelogs, even though filelogs aren't
filecache-ed.
Therefore, this patch introduces blacklist "checkambigfiles", and
avoids file stat ambiguity only for files specified in this blacklist.
This patch consists of two parts below, which should be applied at
once in order to avoid regression.
- specify 'checkambig=True' at vfs.open(mode='a') in _playback()
according to checkambigfiles
- invoke _playback() with checkambigfiles
- add transaction.__init__() checkambigfiles argument, for _abort()
- make localrepo instantiate transaction with _cachedfiles
- add rollback() checkambigfiles argument, for "hg rollback/recover"
- make localrepo invoke rollback() with _cachedfiles
After this patch, straightforward "copy if EPERM" will be reasonable
at closing the file opened with checkambig=True, because this policy
is applied only on files, which are listed in blacklist
"checkambigfiles".
2017-07-04 17:13:46 +03:00
|
|
|
> unlink=True, checkambigfiles=None):
|
|
|
|
> orig(journal, report, opener, vfsmap, entries, backupentries, unlink,
|
|
|
|
> checkambigfiles)
|
localrepo: use changelog.hasnode instead of self.__contains__
Before this patch, releasing the store lock implies the actions below, when
the transaction is aborted:
1. "commithook()" scheduled in "localrepository.commit()" is invoked
2. "changectx.__init__()" is invoked via "self.__contains__()"
3. specified ID is examined against "repo.dirstate.p1()"
4. validation function is invoked in "dirstate.p1()"
In subsequent patches, "dirstate.invalidate()" invocations for
discarding changes are replaced with "dirstateguard", but discarding
changes by "dirstateguard" is executed after releasing the store lock:
resources are acquired in "wlock => dirstateguard => store lock" order,
and are released in reverse order.
This may cause that "dirstate.p1()" still refers to the changeset to be
rolled-back at (4) above: pushing multiple patches by "hg qpush" is
a typical case.
When releasing the store lock, such changesets are:
- not contained in "repo.changelog", if it is reloaded from
".hg/00changelog.i", as that file was already truncated by
"transaction.abort()"
- still contained in it, otherwise
(this "dirty read" problem is discussed in "Transaction Plan"
http://mercurial.selenic.com/wiki/TransactionPlan)
Validation function shows "unknown working parent" warning in the
former case, but reloading "repo.changelog" depends on the timestamp
of ".hg/00changelog.i". This causes occasional test failures.
In the case of scheduled "commithook()", it just wants to examine
whether "node ID" of committed changeset is still valid or not. Other
examinations implied in "changectx.__init__()" are meaningless.
To avoid showing the "unknown working parent" warning irregularly, this
patch uses "changelog.hasnode()" instead of "node in self" to examine
existence of committed changeset.
2015-05-07 06:07:10 +03:00
|
|
|
> # Touching files truncated at "transaction.abort" causes
|
|
|
|
> # forcible re-loading invalidated filecache properties
|
|
|
|
> # (including repo.changelog)
|
|
|
|
> for f, o, _ignore in entries:
|
|
|
|
> if o or not unlink:
|
|
|
|
> os.utime(opener.join(f), (0.0, 0.0))
|
|
|
|
> def extsetup(ui):
|
|
|
|
> extensions.wrapfunction(transaction, '_playback', wrapplayback)
|
|
|
|
> EOF
|
|
|
|
$ hg qpush -a --config extensions.wrapplayback=$TESTTMP/wrapplayback.py && echo 'qpush succeeded?!'
|
2010-09-26 22:43:21 +04:00
|
|
|
applying patch1
|
|
|
|
applying patch2
|
|
|
|
applying bad-patch
|
|
|
|
transaction abort!
|
|
|
|
rollback completed
|
2015-10-12 11:37:09 +03:00
|
|
|
cleaning up working directory...
|
|
|
|
reverting foo
|
|
|
|
done
|
2010-11-08 03:41:41 +03:00
|
|
|
abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
|
2010-09-26 22:43:21 +04:00
|
|
|
[255]
|
|
|
|
$ hg parents
|
|
|
|
changeset: 0:bbd179dfa0a7
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: add foo
|
|
|
|
|
|
|
|
|
2011-03-01 02:41:40 +03:00
|
|
|
test corrupt status file
|
|
|
|
$ hg qpush
|
|
|
|
applying patch1
|
|
|
|
now at: patch1
|
|
|
|
$ cp .hg/patches/status .hg/patches/status.orig
|
|
|
|
$ hg qpop
|
|
|
|
popping patch1
|
|
|
|
patch queue now empty
|
|
|
|
$ cp .hg/patches/status.orig .hg/patches/status
|
|
|
|
$ hg qpush
|
|
|
|
abort: working directory revision is not qtip
|
|
|
|
[255]
|
|
|
|
$ rm .hg/patches/status .hg/patches/status.orig
|
|
|
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
bar should be gone; other unknown/ignored files should still be around
|
|
|
|
|
|
|
|
$ hg status -A
|
|
|
|
? untracked-file
|
|
|
|
I .hgignore
|
|
|
|
C foo
|
|
|
|
|
|
|
|
preparing qpush of a missing patch
|
|
|
|
|
|
|
|
$ hg qpop -a
|
|
|
|
no patches applied
|
|
|
|
$ hg qpush
|
|
|
|
applying patch1
|
|
|
|
now at: patch1
|
|
|
|
$ rm .hg/patches/patch2
|
|
|
|
|
|
|
|
now we expect the push to fail, but it should NOT complain about patch1
|
|
|
|
|
|
|
|
$ hg qpush
|
|
|
|
applying patch2
|
|
|
|
unable to read patch2
|
|
|
|
now at: patch1
|
|
|
|
[1]
|
|
|
|
|
|
|
|
preparing qpush of missing patch with no patch applied
|
|
|
|
|
|
|
|
$ hg qpop -a
|
|
|
|
popping patch1
|
|
|
|
patch queue now empty
|
|
|
|
$ rm .hg/patches/patch1
|
|
|
|
|
|
|
|
qpush should fail the same way as below
|
|
|
|
|
|
|
|
$ hg qpush
|
|
|
|
applying patch1
|
|
|
|
unable to read patch1
|
|
|
|
[1]
|
2011-02-12 11:08:41 +03:00
|
|
|
|
|
|
|
Test qpush to a patch below the currently applied patch.
|
|
|
|
|
|
|
|
$ hg qq -c guardedseriesorder
|
|
|
|
$ hg qnew a
|
|
|
|
$ hg qguard +block
|
|
|
|
$ hg qnew b
|
|
|
|
$ hg qnew c
|
|
|
|
|
|
|
|
$ hg qpop -a
|
|
|
|
popping c
|
|
|
|
popping b
|
|
|
|
popping a
|
|
|
|
patch queue now empty
|
|
|
|
|
|
|
|
try to push and pop while a is guarded
|
|
|
|
|
|
|
|
$ hg qpush a
|
2011-05-31 10:47:16 +04:00
|
|
|
cannot push 'a' - guarded by '+block'
|
2011-02-12 11:08:41 +03:00
|
|
|
[1]
|
|
|
|
$ hg qpush -a
|
|
|
|
applying b
|
|
|
|
patch b is empty
|
|
|
|
applying c
|
|
|
|
patch c is empty
|
|
|
|
now at: c
|
|
|
|
|
|
|
|
now try it when a is unguarded, and we're at the top of the queue
|
mq: report correct numbers for changing "number of guarded, applied patches"
Before this patch, "hg qselect" may report incorrect numbers for
"number of guarded, applied patches has changed", because it examines
"pushable" of patches by the index not in "the series" but in "applied
patches", even though "mq.pushable()" expects the former.
To report correct numbers for changing "number of guarded, applied
patches", this patch uses the name of applied patch to examine
pushable-ness of it.
This patch also changes the result of existing "hg qselect" tests,
because they doesn't change pushable-ness of already applied patches.
This patch assumes that "hg qselect" focuses on changing pushable-ness
only of already applied patches, because:
- the report message uses not "previous" (in the series) but
"applied"
- the logic to pop patches for --pop/--reapply examines
pushable-ness only of already applied ones (in fact, there are
some incorrect code paths)
2014-09-11 21:29:19 +04:00
|
|
|
|
|
|
|
$ hg qapplied -v
|
|
|
|
0 G a
|
|
|
|
1 A b
|
|
|
|
2 A c
|
2011-02-12 11:08:41 +03:00
|
|
|
$ hg qsel block
|
|
|
|
$ hg qpush b
|
|
|
|
abort: cannot push to a previous patch: b
|
|
|
|
[255]
|
|
|
|
$ hg qpush a
|
|
|
|
abort: cannot push to a previous patch: a
|
|
|
|
[255]
|
|
|
|
|
|
|
|
and now we try it one more time with a unguarded, while we're not at the top of the queue
|
|
|
|
|
|
|
|
$ hg qpop b
|
|
|
|
popping c
|
|
|
|
now at: b
|
|
|
|
$ hg qpush a
|
|
|
|
abort: cannot push to a previous patch: a
|
|
|
|
[255]
|
|
|
|
|
2012-05-11 18:17:02 +04:00
|
|
|
test qpop --force and backup files
|
|
|
|
|
|
|
|
$ hg qpop -a
|
|
|
|
popping b
|
|
|
|
patch queue now empty
|
|
|
|
$ hg qq --create force
|
|
|
|
$ echo a > a
|
|
|
|
$ echo b > b
|
|
|
|
$ echo c > c
|
|
|
|
$ hg ci -Am add a b c
|
|
|
|
$ echo a >> a
|
|
|
|
$ hg rm b
|
|
|
|
$ hg rm c
|
|
|
|
$ hg qnew p1
|
|
|
|
$ echo a >> a
|
|
|
|
$ echo bb > b
|
|
|
|
$ hg add b
|
|
|
|
$ echo cc > c
|
|
|
|
$ hg add c
|
|
|
|
$ hg qpop --force --verbose
|
|
|
|
saving current version of a as a.orig
|
|
|
|
saving current version of b as b.orig
|
|
|
|
saving current version of c as c.orig
|
|
|
|
popping p1
|
|
|
|
patch queue now empty
|
|
|
|
$ hg st
|
|
|
|
? a.orig
|
|
|
|
? b.orig
|
|
|
|
? c.orig
|
|
|
|
? untracked-file
|
|
|
|
$ cat a.orig
|
|
|
|
a
|
|
|
|
a
|
|
|
|
a
|
|
|
|
$ cat b.orig
|
|
|
|
bb
|
|
|
|
$ cat c.orig
|
|
|
|
cc
|
2012-05-11 18:18:47 +04:00
|
|
|
|
2012-05-11 18:57:26 +04:00
|
|
|
test qpop --force --no-backup
|
|
|
|
|
|
|
|
$ hg qpush
|
|
|
|
applying p1
|
|
|
|
now at: p1
|
|
|
|
$ rm a.orig
|
|
|
|
$ echo a >> a
|
|
|
|
$ hg qpop --force --no-backup --verbose
|
|
|
|
popping p1
|
|
|
|
patch queue now empty
|
|
|
|
$ test -f a.orig && echo 'error: backup with --no-backup'
|
|
|
|
[1]
|
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
test qpop --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
|
|
|
|
$ hg qpush
|
|
|
|
applying p1
|
|
|
|
now at: p1
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes --force
|
|
|
|
abort: cannot use both --force and --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ echo a >> a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes
|
2015-10-14 10:30:27 +03:00
|
|
|
abort: local changes found, qrefresh first
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ hg revert -qa a
|
|
|
|
$ rm a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes
|
2015-10-14 10:30:27 +03:00
|
|
|
abort: local changes found, qrefresh first
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ hg rm -A a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes
|
2015-10-14 10:30:27 +03:00
|
|
|
abort: local changes found, qrefresh first
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ hg revert -qa a
|
|
|
|
$ echo b > b
|
|
|
|
$ hg add b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes
|
2015-10-14 10:30:27 +03:00
|
|
|
abort: local changes found, qrefresh first
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ hg forget b
|
|
|
|
$ echo d > d
|
|
|
|
$ hg add d
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpop --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
popping p1
|
|
|
|
patch queue now empty
|
|
|
|
$ hg forget d
|
|
|
|
$ rm d
|
|
|
|
|
2012-05-11 18:18:47 +04:00
|
|
|
test qpush --force and backup files
|
|
|
|
|
|
|
|
$ echo a >> a
|
|
|
|
$ hg qnew p2
|
|
|
|
$ echo b >> b
|
|
|
|
$ echo d > d
|
|
|
|
$ echo e > e
|
|
|
|
$ hg add d e
|
|
|
|
$ hg rm c
|
|
|
|
$ hg qnew p3
|
|
|
|
$ hg qpop -a
|
|
|
|
popping p3
|
|
|
|
popping p2
|
|
|
|
patch queue now empty
|
|
|
|
$ echo a >> a
|
|
|
|
$ echo b1 >> b
|
|
|
|
$ echo d1 > d
|
|
|
|
$ hg add d
|
|
|
|
$ echo e1 > e
|
|
|
|
$ hg qpush -a --force --verbose
|
|
|
|
applying p2
|
|
|
|
saving current version of a as a.orig
|
|
|
|
patching file a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2012-05-11 18:18:47 +04:00
|
|
|
a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2012-05-11 18:18:47 +04:00
|
|
|
applying p3
|
|
|
|
saving current version of b as b.orig
|
|
|
|
saving current version of d as d.orig
|
|
|
|
patching file b
|
|
|
|
patching file c
|
|
|
|
patching file d
|
|
|
|
file d already exists
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file d.rej
|
|
|
|
patching file e
|
|
|
|
file e already exists
|
|
|
|
1 out of 1 hunks FAILED -- saving rejects to file e.rej
|
|
|
|
patch failed to apply
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2012-05-11 18:18:47 +04:00
|
|
|
b
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2015-03-17 15:53:17 +03:00
|
|
|
patch failed, rejects left in working directory
|
2015-10-14 10:30:27 +03:00
|
|
|
errors during apply, please fix and qrefresh p3
|
2012-05-11 18:18:47 +04:00
|
|
|
[2]
|
|
|
|
$ cat a.orig
|
|
|
|
a
|
|
|
|
a
|
|
|
|
$ cat b.orig
|
|
|
|
b
|
|
|
|
b1
|
|
|
|
$ cat d.orig
|
|
|
|
d1
|
2012-05-11 18:57:26 +04:00
|
|
|
|
|
|
|
test qpush --force --no-backup
|
|
|
|
|
|
|
|
$ hg revert -qa
|
|
|
|
$ hg qpop -a
|
|
|
|
popping p3
|
|
|
|
popping p2
|
|
|
|
patch queue now empty
|
|
|
|
$ echo a >> a
|
|
|
|
$ rm a.orig
|
|
|
|
$ hg qpush --force --no-backup --verbose
|
|
|
|
applying p2
|
|
|
|
patching file a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2012-05-11 18:57:26 +04:00
|
|
|
a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2012-05-11 18:57:26 +04:00
|
|
|
now at: p2
|
|
|
|
$ test -f a.orig && echo 'error: backup with --no-backup'
|
|
|
|
[1]
|
|
|
|
|
|
|
|
test qgoto --force --no-backup
|
|
|
|
|
|
|
|
$ hg qpop
|
|
|
|
popping p2
|
|
|
|
patch queue now empty
|
|
|
|
$ echo a >> a
|
|
|
|
$ hg qgoto --force --no-backup p2 --verbose
|
|
|
|
applying p2
|
|
|
|
patching file a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing files:
|
2012-05-11 18:57:26 +04:00
|
|
|
a
|
2014-04-18 15:33:20 +04:00
|
|
|
committing manifest
|
|
|
|
committing changelog
|
2012-05-11 18:57:26 +04:00
|
|
|
now at: p2
|
|
|
|
$ test -f a.orig && echo 'error: backup with --no-backup'
|
|
|
|
[1]
|
2012-05-12 02:19:30 +04:00
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
test qpush --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes --force
|
|
|
|
abort: cannot use both --force and --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes --exact
|
|
|
|
abort: cannot use --exact and --keep-changes together
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ echo b >> b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
2015-04-21 02:13:44 +03:00
|
|
|
abort: conflicting local changes found
|
|
|
|
(did you forget to qrefresh?)
|
|
|
|
[255]
|
2012-05-12 02:19:30 +04:00
|
|
|
$ rm b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
2015-04-21 02:13:44 +03:00
|
|
|
abort: conflicting local changes found
|
|
|
|
(did you forget to qrefresh?)
|
|
|
|
[255]
|
2012-05-12 02:19:30 +04:00
|
|
|
$ hg rm -A b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
2015-04-21 02:13:44 +03:00
|
|
|
abort: conflicting local changes found
|
|
|
|
(did you forget to qrefresh?)
|
|
|
|
[255]
|
2012-05-12 02:19:30 +04:00
|
|
|
$ hg revert -aq b
|
|
|
|
$ echo d > d
|
|
|
|
$ hg add d
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
2015-04-21 02:13:44 +03:00
|
|
|
abort: conflicting local changes found
|
|
|
|
(did you forget to qrefresh?)
|
|
|
|
[255]
|
2012-05-12 02:19:30 +04:00
|
|
|
$ hg forget d
|
|
|
|
$ rm d
|
|
|
|
$ hg qpop
|
|
|
|
popping p2
|
|
|
|
patch queue now empty
|
|
|
|
$ echo b >> b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qpush -a --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p2
|
|
|
|
applying p3
|
2015-04-21 02:13:44 +03:00
|
|
|
abort: conflicting local changes found
|
|
|
|
(did you forget to qrefresh?)
|
|
|
|
[255]
|
2012-05-12 02:19:30 +04:00
|
|
|
$ hg qtop
|
|
|
|
p2
|
|
|
|
$ hg parents --template "{rev} {desc}\n"
|
|
|
|
2 imported patch p2
|
|
|
|
$ hg st b
|
|
|
|
M b
|
|
|
|
$ cat b
|
|
|
|
b
|
|
|
|
b
|
2012-05-12 02:19:30 +04:00
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
test qgoto --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
|
|
|
|
$ hg revert -aq b
|
|
|
|
$ rm e
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qgoto --keep-changes --force p3
|
|
|
|
abort: cannot use both --force and --keep-changes
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ echo a >> a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qgoto --keep-changes p3
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
|
|
|
now at: p3
|
|
|
|
$ hg st a
|
|
|
|
M a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg qgoto --keep-changes p2
|
2012-05-12 02:19:30 +04:00
|
|
|
popping p3
|
|
|
|
now at: p2
|
|
|
|
$ hg st a
|
|
|
|
M a
|
2012-05-12 02:19:30 +04:00
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
test mq.keepchanges setting
|
2012-05-12 02:19:30 +04:00
|
|
|
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg --config mq.keepchanges=1 qpush
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
|
|
|
now at: p3
|
|
|
|
$ hg st a
|
|
|
|
M a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg --config mq.keepchanges=1 qpop
|
2012-05-12 02:19:30 +04:00
|
|
|
popping p3
|
|
|
|
now at: p2
|
|
|
|
$ hg st a
|
|
|
|
M a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg --config mq.keepchanges=1 qgoto p3
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p3
|
|
|
|
now at: p3
|
|
|
|
$ hg st a
|
|
|
|
M a
|
|
|
|
$ echo b >> b
|
2015-11-11 01:52:54 +03:00
|
|
|
$ hg --config mq.keepchanges=1 qpop --force --config 'ui.origbackuppath=.hg/origbackups'
|
2012-05-12 02:19:30 +04:00
|
|
|
popping p3
|
|
|
|
now at: p2
|
|
|
|
$ hg st b
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg --config mq.keepchanges=1 qpush --exact
|
2015-10-14 10:30:27 +03:00
|
|
|
abort: local changes found, qrefresh first
|
2012-05-12 02:19:30 +04:00
|
|
|
[255]
|
|
|
|
$ hg revert -qa a
|
|
|
|
$ hg qpop
|
|
|
|
popping p2
|
|
|
|
patch queue now empty
|
|
|
|
$ echo a >> a
|
2012-05-13 16:00:58 +04:00
|
|
|
$ hg --config mq.keepchanges=1 qpush --force
|
2012-05-12 02:19:30 +04:00
|
|
|
applying p2
|
|
|
|
now at: p2
|
|
|
|
$ hg st a
|
2012-06-11 03:40:51 +04:00
|
|
|
|
2015-11-11 01:52:54 +03:00
|
|
|
test previous qpop (with --force and --config) saved .orig files to where user
|
|
|
|
wants them
|
|
|
|
$ ls .hg/origbackups
|
|
|
|
b.orig
|
|
|
|
$ rm -rf .hg/origbackups
|
|
|
|
|
2012-06-11 03:40:51 +04:00
|
|
|
$ cd ..
|