Matt Mackall <mpm@selenic.com> [Fri, 27 Jan 2012 18:43:31 -0600] rev 16004
merge with i18n
Alexander Sauta <demosito@gmail.com> [Fri, 27 Jan 2012 12:25:02 +0400] rev 16003
i18n-ru: synchronized with bf502ccc46d7; fuzzies removed
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 26 Jan 2012 16:56:11 +0400] rev 16002
i18n-ru: fix typos in `resolve` help
* help entry is called 'merge-tools', not 'merge-tool';
* envvar is called HGMERGE, not HGEMERGT.
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 20:34:57 -0600] rev 16001
merge: defer symlink flag merging to filemerge (issue3200)
Previously, we could change a normal file into a corrupt symlink when
trying to merge a symlink flag. Now, we leave the flag alone and let
filemerge deal with it (usually by a prompt).
We also drop a redundant flag setting after filemerge (now dealt with
by ms.resolve) that would cause similar corruption.
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:52 -0600] rev 16000
help: fix publish option spelling in phases topic
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:22 -0600] rev 15999
help: add missing phase config items to config topic
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 17:23:43 -0200] rev 15998
help/phases: remove trailing whitespace
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:15 -0600] rev 15997
sslutil: more helpful fingerprint mismatch message
This will aid debugging for users of sites that renew certs.
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:14 -0600] rev 15996
help: add phases topic
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 12:09:14 -0200] rev 15995
i18n-pt_BR: synchronized with 0b05e0bfdc1c
Matt Mackall <mpm@selenic.com> [Wed, 25 Jan 2012 17:14:10 -0600] rev 15994
copies: remove stray print
Matt Mackall <mpm@selenic.com> [Wed, 25 Jan 2012 17:14:08 -0600] rev 15993
scmutil: unify some 'no changes found' messages
This keeps the wording more consistent for secret csets
Alain Leufroy <alain.leufroyATgmailMYDOTcom> [Wed, 25 Jan 2012 19:41:34 +0100] rev 15992
outgoing: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom> [Wed, 25 Jan 2012 19:05:16 +0100] rev 15991
bundle: display info about secret changets while no sharable changeset found
Augie Fackler <durin42@gmail.com> [Mon, 23 Jan 2012 12:26:01 -0600] rev 15990
test-rebase-collapse: Add test for rebase regression introduced in 12309c09d19a
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:55 +0200] rev 15989
test-commandserver: test that phase data is being refreshed
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:54 +0200] rev 15988
localrepo: delete _phaserev when invalidating caches
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:53 +0200] rev 15987
localrepo: fix phaseroots filecache definition
it's in .hg/store
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Jan 2012 19:49:30 +0100] rev 15986
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.
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 14:06:04 -0600] rev 15985
help: mark strings for translation
David Soria Parra <dsp@php.net> [Wed, 25 Jan 2012 20:03:46 +0100] rev 15984
bookmarks: respect --debug during incoming/outgoing
Na'Tosha Bard <natosha@unity3d.com> [Wed, 25 Jan 2012 16:52:16 +0100] rev 15983
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com> [Wed, 25 Jan 2012 14:10:01 +0100] rev 15982
largefiles: fix transplant for all cases (issue3192)
Andrei Polushin <polushin@gmail.com> [Wed, 25 Jan 2012 03:01:19 +0700] rev 15981
i18n-ru: synchronized with 9f2ed48f8cda
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 10:13:06 +0100] rev 15980
i18n-sv: translated phase
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 09:33:48 +0100] rev 15979
i18n-sv: translating strings for add, annotate, debuginstall
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 08:48:52 +0100] rev 15978
i18n-sv: synchronized with c2e6c5ef4555
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2012 17:17:37 -0600] rev 15977
merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2012 17:16:29 -0600] rev 15976
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'
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Jan 2012 16:12:32 -0200] rev 15975
i18n-pt_BR: synchronized with f7c8d6ee6056
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Jan 2012 16:11:37 -0200] rev 15974
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Fri, 20 Jan 2012 11:11:36 +0100] rev 15973
i18n-sv: synchronized with 7ed056f1e97d
Augie Fackler <durin42@gmail.com> [Sat, 21 Jan 2012 21:39:27 -0600] rev 15972
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.
Jesus Espino Garcia <jesus.espino@kaleidos.net> [Sat, 21 Jan 2012 23:50:58 +0100] rev 15971
patch: a little bit more robust line counting on diff --stat (issue3183)
Jesus Espino Garcia <jesus.espino@kaleidos.net> [Sat, 21 Jan 2012 13:31:41 +0100] rev 15970
convert: subversion convert abort on revision not found (issue 3205)
Jesus Espino Garcia <jesus.espino@kaleidos.net> [Sat, 21 Jan 2012 00:40:18 +0100] rev 15969
bash_completion: added -o filename option to _hg_status (issue3101)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 22 Jan 2012 21:30:09 +0100] rev 15968
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.
Na'Tosha Bard <natosha@unity3d.com> [Mon, 23 Jan 2012 13:24:32 +0100] rev 15967
largefiles: fix addremove when no largefiles are specified
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 23:52:31 -0600] rev 15966
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'.
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 23:10:13 -0600] rev 15965
revset: remove unreferenced followfile function
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 23:05:04 -0600] rev 15964
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()')"
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 22:19:40 -0600] rev 15963
fileset: don't attempt to check data predicates against removed files
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 19:22:09 -0600] rev 15962
revset: simplify help not about quoting
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 15:30:28 -0600] rev 15961
Added signature for changeset db33555eafea
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 15:30:25 -0600] rev 15960
Added tag 2.1-rc for changeset db33555eafea
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 15:25:39 -0600] rev 15959
bookmarks: correct correction of -i
Idan Kamara <idankk86@gmail.com> [Fri, 20 Jan 2012 23:05:14 +0200] rev 15958
commands: drop exclamation mark in abort message
Kevin Bullock <kbullock@ringworld.org> [Thu, 19 Jan 2012 16:10:26 -0600] rev 15957
update: note ways to avoid moving bookmark
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 20 Jan 2012 21:21:13 +0100] rev 15956
push: prevent moving phases outside of the pushed subset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 20 Jan 2012 19:41:18 +0100] rev 15955
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
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 20 Jan 2012 19:23:53 +0100] rev 15954
phase: extracts heads computation logics from analyzeremotephases
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 20 Jan 2012 19:18:09 +0100] rev 15953
phase: fix warning text from invalid remote phase
add missing end of line and substitution.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 20 Jan 2012 18:45:29 +0100] rev 15952
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.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 20 Jan 2012 00:27:11 +0100] rev 15951
phases: properly register excluded changeset when revision are specified
There was no other drawback than a bad UI message for now.
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 14:19:13 -0600] rev 15950
bookmarks: make -i summary simpler and more accurate
Matt Mackall <mpm@selenic.com> [Fri, 20 Jan 2012 14:18:51 -0600] rev 15949
revset: allow slashes in symbols
suggested by Ryan Kelly
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 20 Jan 2012 13:19:32 -0200] rev 15948
phases: do not mark debug message for translation
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 20 Jan 2012 13:10:01 -0200] rev 15947
templatekw: fix phase keywords
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 20 Jan 2012 12:57:13 -0200] rev 15946
phases: fix typo in warning message
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 20 Jan 2012 12:04:45 -0200] rev 15945
rebase: drop uppercase in abort message