Matt Mackall
e4d11ad28c
scmutil: unify some 'no changes found' messages
...
This keeps the wording more consistent for secret csets
2012-01-25 17:14:08 -06:00
Alain Leufroy
9a455ccd0e
outgoing: display info about secret changets while no sharable changeset found
2012-01-25 19:41:34 +01:00
Alain Leufroy
b62e38b78d
bundle: display info about secret changets while no sharable changeset found
2012-01-25 19:05:16 +01:00
Augie Fackler
68e234d364
test-rebase-collapse: Add test for rebase regression introduced in 5f0e8de75b35
2012-01-23 12:26:01 -06:00
Idan Kamara
3e9227d2bd
test-commandserver: test that phase data is being refreshed
2012-01-26 00:21:55 +02:00
Idan Kamara
e23559bcc5
localrepo: delete _phaserev when invalidating caches
2012-01-26 00:21:54 +02:00
Idan Kamara
450a4ebd58
localrepo: fix phaseroots filecache definition
...
it's in .hg/store
2012-01-26 00:21:53 +02:00
Pierre-Yves David
6671f18b78
discovery: fix regression when checking heads for pre 1.4 client (issue3218)
...
This code is not run by the test suite and silly name error were lurking here.
2012-01-24 19:49:30 +01:00
Jens Bäckman
a286708816
help: mark strings for translation
2012-01-25 14:06:04 -06:00
David Soria Parra
adfa1608de
bookmarks: respect --debug during incoming/outgoing
2012-01-25 20:03:46 +01:00
Na'Tosha Bard
979dbb4473
largefiles: fix revert on missing largefile (issue3217)
2012-01-25 16:52:16 +01:00
Na'Tosha Bard
e63a87cfd7
largefiles: fix transplant for all cases (issue3192)
2012-01-25 14:10:01 +01:00
Andrei Polushin
5b46d0b7d1
i18n-ru: synchronized with 2b4cc3ef6fb0
2012-01-25 03:01:19 +07:00
Jens Bäckman
f723f47c64
i18n-sv: translated phase
2012-01-25 10:13:06 +01:00
Jens Bäckman
0a0d57304b
i18n-sv: translating strings for add, annotate, debuginstall
2012-01-25 09:33:48 +01:00
Jens Bäckman
f1e80a8736
i18n-sv: synchronized with ca6bf7184765
2012-01-25 08:48:52 +01:00
Matt Mackall
af2c97d60d
merge with i18n
2012-01-24 17:17:37 -06:00
Matt Mackall
4b04e60eef
copies: eliminate criss-crosses when chaining
...
Before the copies refactoring, we declared that if a and b were
present in source and destination, we ignored copies between them. The
refactored code could however report b was a copy of a and vice versa
in a situation where we looked for differences between two identical
changesets that copy a to b.
y
/
x
\
y'
2012-01-24 17:16:29 -06:00
Wagner Bruna
edfaf4ebd2
i18n-pt_BR: synchronized with 991dfb7cf1f1
2012-01-23 16:12:32 -02:00
Wagner Bruna
6ba39aae76
merge with i18n
2012-01-23 16:11:37 -02:00
Augie Fackler
b7b4c9e86d
mq: pass qbase node instead of mq statusentry in phasedefaults
...
This was breaking my remotebranches extension in a completely
mystifying way, because repo.lookup was failing to resolve the
statusentry. I'm not sure how this works absent my remotebranches
extension, but doing it this way looks more correct and doesn't break
anything.
2012-01-21 21:39:27 -06:00
Jesus Espino Garcia
9146d99b1d
patch: a little bit more robust line counting on diff --stat (issue3183)
2012-01-21 23:50:58 +01:00
Jesus Espino Garcia
16484a55ad
convert: subversion convert abort on revision not found (issue 3205)
2012-01-21 13:31:41 +01:00
Matt Mackall
87fbd9f786
revset: include the correct first ancestor change for follow(file)
...
Previously we always included '.', which may not touch a file.
Instead, find the file revision present in '.' and add its linkrev.
This matches the results of 'hg log --follow file'.
2012-01-20 23:52:31 -06:00
Matt Mackall
0a56dd5a65
revset: remove unreferenced followfile function
2012-01-20 23:10:13 -06:00
Matt Mackall
8524d0bc06
revsets: provide contexts for filesets
...
Before this change, revsets containing fileset patterns failed. This
allows queries like:
hg log -r "contains('set: added() and symlink()')"
2012-01-20 23:05:04 -06:00
Matt Mackall
da19c55d26
fileset: don't attempt to check data predicates against removed files
2012-01-20 22:19:40 -06:00
Matt Mackall
80b55e7b48
revset: simplify help not about quoting
2012-01-20 19:22:09 -06:00
Jesus Espino Garcia
2574ec2be2
bash_completion: added -o filename option to _hg_status (issue3101)
2012-01-21 00:40:18 +01:00
Pierre-Yves David
489da655c0
phase: alway return a value
...
With the previous code, the phase command was returning None when displaying
phase and 0 or 1 when moving them.
This seemed an bit odd and displaying phase return 0 too now.
2012-01-22 21:30:09 +01:00
Na'Tosha Bard
a93a493b94
largefiles: fix addremove when no largefiles are specified
2012-01-23 13:24:32 +01:00
Matt Mackall
187f35b972
Added signature for changeset 9123ec1ebc10
2012-01-20 15:30:28 -06:00
Matt Mackall
a57d42adc3
bookmarks: correct correction of -i
2012-01-20 15:25:39 -06:00
Idan Kamara
9abd35e5ee
commands: drop exclamation mark in abort message
2012-01-20 23:05:14 +02:00
Jens Bäckman
6ebbc6f015
i18n-sv: synchronized with 1c32259b0266
2012-01-20 11:11:36 +01:00
Kevin Bullock
0ffedb7ebf
update: note ways to avoid moving bookmark
2012-01-19 16:10:26 -06:00
Pierre-Yves David
7b8b0389cd
push: prevent moving phases outside of the pushed subset
2012-01-20 21:21:13 +01:00
Pierre-Yves David
06014d092f
discovery: ensure that missingheads are always heads of everything we tried
...
This only alter the third block executed when:
* repo have secret changeset
* onlyheads is not None
In other case findcommonoutgoing already had this behavior
2012-01-20 19:41:18 +01:00
Pierre-Yves David
638304be51
phase: extracts heads computation logics from analyzeremotephases
2012-01-20 19:23:53 +01:00
Pierre-Yves David
bcece1636b
phase: fix warning text from invalid remote phase
...
add missing end of line and substitution.
2012-01-20 19:18:09 +01:00
Pierre-Yves David
f813e53446
mq-safety: don't apply safety on non-outgoing changeset
...
When mq changeset are secret, they don't appear in outgoing and won't be
pushed. So it's not necessary to abort the push.
The checkpush call is protected by lock to prevent race on phase.
2012-01-20 18:45:29 +01:00
Pierre-Yves David
fa04c4b2de
phases: properly register excluded changeset when revision are specified
...
There was no other drawback than a bad UI message for now.
2012-01-20 00:27:11 +01:00
Matt Mackall
e52f0054ce
bookmarks: make -i summary simpler and more accurate
2012-01-20 14:19:13 -06:00
Matt Mackall
7eeb2f277f
revset: allow slashes in symbols
...
suggested by Ryan Kelly
2012-01-20 14:18:51 -06:00
Wagner Bruna
ce7ff22344
phases: do not mark debug message for translation
2012-01-20 13:19:32 -02:00
Wagner Bruna
ec5d06f3b6
templatekw: fix phase keywords
2012-01-20 13:10:01 -02:00
Wagner Bruna
2034ccc9cf
phases: fix typo in warning message
2012-01-20 12:57:13 -02:00
Wagner Bruna
32e015e05a
rebase: drop uppercase in abort message
2012-01-20 12:04:45 -02:00
Matt Mackall
06e236e8f8
revset: add remote() predicate to lookup remote revisions
2012-01-19 14:31:05 -06:00
Matt Mackall
0e96c1d311
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
2012-01-19 14:07:48 -06:00
