Commit Graph

8368 Commits

Author SHA1 Message Date
FUJIWARA Katsunori
8e9263abed revset: fix documentation for 'remote()' predicate
current documentation for 'remote()' predicate is wrong about
specification of parameters.

there are 3 patterns:

  # of
  param:  id:              remote:
  - 0     current branch   "defult" remote
  - 1     specified        "defult" remote
  - 2     specified        specified
2012-01-27 22:29:58 +09:00
FUJIWARA Katsunori
fa22f7f531 revset: fix 'remote()' failure when remote repo has more revs than local
current 'remote()' implementation uses 'r' variable, even if it is not
initialized when 'if n in repo' is not true.

this causes unexpected exception.
2012-01-27 22:29:58 +09:00
Wagner Bruna
26bcf69404 help/config: fix help command markup 2012-01-27 12:52:13 -02:00
Matt Mackall
630fa7d8fc 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.
2012-01-26 20:34:57 -06:00
Matt Mackall
d26a97cacb help: fix publish option spelling in phases topic 2012-01-26 17:54:52 -06:00
Matt Mackall
101ede8d22 help: add missing phase config items to config topic 2012-01-26 17:54:22 -06:00
Wagner Bruna
9e310d7986 help/phases: remove trailing whitespace 2012-01-26 17:23:43 -02:00
Matt Mackall
5a379a202e sslutil: more helpful fingerprint mismatch message
This will aid debugging for users of sites that renew certs.
2012-01-26 11:23:15 -06:00
Matt Mackall
578253989c help: add phases topic 2012-01-26 11:23:14 -06:00
Matt Mackall
11ed3204e8 copies: remove stray print 2012-01-25 17:14:10 -06:00
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
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
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
Jesus Espino Garcia
9146d99b1d patch: a little bit more robust line counting on diff --stat (issue3183) 2012-01-21 23:50:58 +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
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
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
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
Kevin Bullock
c4ab5bfe8b bookmarks: clarify help for -i/--inactive 2012-01-19 16:05:01 -06:00
Wagner Bruna
4d98f252a4 revset: fix typo in message 2012-01-20 13:19:39 -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
Pierre-Yves David
78c5d64e2e phases: only synchronize on common changeset when push fails
If push failed we should not expect the pushed changeset to exist on remote.
The common set before the push is used for phase related operation instead of
common + missing.

Note:
  * We still pull phase data even if push fails
  * We still try to push data even if push fails (same than bookmark)
2012-01-19 16:09:43 +01:00
Pierre-Yves David
a445988112 discovery: diet discovery.prepush from non-discovery code
The ``discovery.prepush`` function was doing multiple things not related to
discovery. This changeset move some code into the ``localrepo.push`` method. The
old ``discovery.prepush`` function jobs is now restricted to checking for
multple head creation. It was then renamed ``discovery.checkheads``.

This new ``discovery.checkheads`` function may receive several other changes in
the future but we are a bit too much near the freeze for a wider refactoring.
2012-01-19 15:50:55 +01:00
Mads Kiilerich
dbffdfd960 tag: invalidate tag cache immediately after adding new tag (issue3210)
New tags were written to .hgtags / .hglocaltags without updating or
invalidating the localrepo cache.

Before 462e6cfb1bac a lock was acquired soon after the new tags had been
written, and that invalidated the cache so the new tags for example could be
seen in pretxncommit hooks. With 462e6cfb1bac the lock had already been
acquired at this point and the missing cache invalidation was exposed.

The tag caches will now explicitly and immediately be invalidated when new tags
are added.
2012-01-19 02:14:06 +01:00
Matt Mackall
464b6bafef wireproto: refuse to lookup secret csets 2012-01-18 20:00:48 -06:00
Pierre-Yves David
7448ca3281 phases: mechanism to allow extension to alter initial computation of phase
This commit add a whennodata list where extension can register a callback to be
called if no phase related data are found in the repository.

The goal is to ensure the existing extension that move phase data in 2.1 can
compute consistent phase boundary for existing repo.
2012-01-18 17:23:54 +01:00
Pierre-Yves David
3dfd3d6ee3 config: have a way to backup and restore value in config
This is introduce to allow temporary overwriting of a config value while being
able to reinstall the old value once done. The main advantage over using
``config`` and ``setconfig`` is that backup and restore will properly restore
the lack of any config. Restoring the fact that there was no value is important
to allow config user to keep using meaniful default value.

A more naive approach will result in the following scenario::

  Before:
    config(section, item, my_default) --> my_default

  temporal overwrite
    old = config(section, item)
    …
    setconfig(section, item, old)

  After
    config(section, item, my_default) --> None

The first user of this feature should be mq to overwriting minimal phase of
future commit.
2012-01-18 16:52:26 +01:00