Mercurial > hg
annotate tests/test-extra-filelog-entry.t @ 12998:91cb08a9e7fb
discovery: list new remote heads in prepush() on --debug
With this patch applied, Mercurial will list the hashes of new remote heads
if push --debug aborts because of new remote heads (option -f/--force not set).
Example:
$ hg push --debug repo1
using http://example.org/repo1
http auth: user johndoe, password not set
sending between command
pushing to http://example.org/repo1
sending capabilities command
capabilities: changegroupsubset stream=1 lookup pushkey unbundle=HG10GZ,HG10BZ,HG10UN branchmap
sending heads command
searching for changes
common changesets up to 609edbc7853f
sending branchmap command
new remote heads on branch 'default' <- new output line
new remote head 5862c07f53a2 <- new output line
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Compare to without --debug (not changed by this patch, including it here
for reference purposes only):
$ hg push repo1
pushing to http://example.org/repo1
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Motivation for this change:
'hg outgoing' may list a whole lot of benign changesets plus an odd changeset
that will trigger the "new remote heads" abort. It can be hard to spot that
single unwanted changeset (it may be an old forgotten experiment, lingering
in the local repo).
"hg log -r 'heads(outgoing())'" might be useful, but that also lists a head
that may be benign on push.
Inside prepush(), we already know which heads are causing troubles on 'hg push'.
Why not make that info available (at least on --debug)?
This would also be helpful for doing remote support, as the supporter can ask
the user to paste the output of 'hg push --debug' on error and then ask further
questions about the heads listed.
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 11 Nov 2010 15:51:20 +0100 |
parents | 4fee1fd3de9a |
children | ec5886db9dc6 |
rev | line source |
---|---|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12328
diff
changeset
|
1 Issue351: mq: qrefresh can create extra revlog entry |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
4 $ echo "mq=" >> $HGRCPATH |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
6 $ hg init |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
7 $ hg qinit |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
8 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
9 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
10 $ hg ci -A -m foo |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
11 adding b |
4531
b51a8138292a
Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
12305
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
13 $ echo cc > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
14 $ hg qnew -f foo.diff |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
15 $ echo b > b |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
16 $ hg qrefresh |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
17 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
18 $ hg debugindex .hg/store/data/b.i |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
19 rev offset length base linkrev nodeid p1 p2 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
20 0 0 3 0 0 1e88685f5dde 000000000000 000000000000 |
fd78997d1e6b
tests: unify test-extra-filelog-entry
Adrian Buehlmann <adrian@cadifra.com>
parents:
4531
diff
changeset
|
21 |