Commit Graph

11119 Commits

Author SHA1 Message Date
Matt Mackall
5712bac3b8 hgweb: always clear report_untrusted and interactive 2010-04-26 11:03:40 -05:00
Matt Mackall
d803a5b601 hgweb: add baseui to hgweb entrypoint 2010-04-26 11:03:40 -05:00
Matt Mackall
3fea1c3bdd hgweb: make baseui parameter non-positional 2010-04-26 11:03:40 -05:00
Matt Mackall
51f651d888 hgweb: make top-level prototypes mirror their callees 2010-04-26 11:03:40 -05:00
Matt Mackall
47e3accbd1 Merge with stable 2010-04-26 11:02:11 -05:00
Patrick Mezard
ed31d6901d color: handle non-standard stdout on win32 2010-04-23 14:29:44 +02:00
Patrick Mezard
ec8a419814 Merge with crew-stable 2010-04-25 23:36:56 +02:00
Martin Geisler
0d2cf4548b minirst: support all recommended title adornments 2010-04-25 18:19:54 +02:00
Martin Geisler
52cafb8233 minirst: correctly format sections containing inline markup
Before, a section like

  ``foo``
  -------

would be formatted as

  "foo"
  -------

We now recompute the length of the underline when formatting the
section.
2010-04-25 17:48:26 +02:00
Henrik Stuart
1c5ca1f5d8 ui: support quotes in configlist (issue2147)
Several places that use ui.configlist, predominantly in authentication
scenarios need to interface with systems that can contain spaces in usernames
(e.g. when client certificates are usernames, or Windows usernames).

This changeset introduces a parser that supports quoting of strings, and
escape quotation marks that get decoded into a single quotation mark that
adopts the usual behavior one would expect from quoting strings. The Python
library shlex module is not used, on purpose, as that raises if it cannot
match quotation marks in the given input.
2010-04-25 17:38:41 +02:00
Martin Geisler
68483a49bd Merge with stable 2010-04-25 17:11:50 +02:00
Martin Geisler
e334ff8231 Merge with stable 2010-04-25 16:46:44 +02:00
Martin Geisler
3213b9890f minirst: add test for sections 2010-04-25 16:17:24 +02:00
Martin Geisler
9f9d28399a contrib/win32: update build instructions after 54a12ae534c6 2010-04-24 23:08:27 +02:00
Augie Fackler
9af6a77207 keyword: monkeypatch patch so that optional args can be passed as kwargs 2010-04-17 13:38:42 -05:00
Augie Fackler
2556500e58 patch: refactor applydiff to allow for mempatching 2010-04-17 13:23:24 -05:00
Augie Fackler
4da02e74e7 patch: move mercurial-specific imports after stdlib imports 2010-04-17 13:13:57 -05:00
Augie Fackler
d92b325779 test-record: add hg summary to verify we update dirstate 2010-04-16 14:24:40 -05:00
Benoit Boissinot
e196c3bc8f log -b: use opts.get() instead of assuming opts is correctly filled 2010-04-20 01:08:20 +02:00
Matt Mackall
399ebe1c0f Merge with stable 2010-04-19 17:00:02 -05:00
Dévai Tamás
e12c5e6824 Respect the DESTDIR variable during 'make install'
The DESTDIR variable used to tell 'make install' an alternate system root
to install the software to. Since setup.py supports the same via its --root
parameter, it's easy to make life easier for many packagers.
2010-04-16 23:59:43 +02:00
Benoit Boissinot
f54fbfa907 dirstate: remove unused variable 2010-04-16 19:18:20 +02:00
Martin Geisler
5b1e19c3e0 Merge with stable 2010-04-16 22:14:14 +02:00
Dan Villiom Podlaski Christiansen
3b0b530a9d mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in 6805fe267fe5, which was
accidentally removed when labelling was introduced in af5046e50cc6.
2010-04-15 18:12:28 +02:00
Christian Ebert
5a7688ec87 keyword: replace deprecated mq commands in test 2010-04-16 14:30:13 +02:00
Adrian Buehlmann
5b1887513a wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
2010-04-16 14:57:30 +02:00
Benoit Boissinot
6391cd8a8c merge with stable 2010-04-16 01:58:14 +02:00
Sune Foldager
3a5dc74781 merge with stable 2010-04-15 22:34:26 +02:00
Benoit Boissinot
443d0248ba merge with stable 2010-04-15 20:25:26 +02:00
Benoit Boissinot
d3f20dbc7d merge with stable 2010-04-15 19:03:03 +02:00
Sune Foldager
fac215850a localrepo: simplify _updatebranchcache slightly 2010-04-15 17:25:37 +02:00
Benoit Boissinot
99744e205a merge with stable 2010-04-15 15:35:06 +02:00
Benoit Boissinot
b2fa643944 add +x to test-update-renames, removed by the merge on 0b01431fee25 2010-04-15 15:34:27 +02:00
Benoit Boissinot
9037401fec merge with stable 2010-04-15 13:52:41 +02:00
Sune Foldager
f2631c6182 merge with stable 2010-04-14 19:49:06 +02:00
Sune Foldager
c7f5c787cc merge 2010-04-14 19:43:40 +02:00
Sune Foldager
0fd6b63c90 prepush: backed out refactoring
It has some problems in corner cases and will fail on a test recently
introduced on stable. Will maybe be reintroduced later, in a better
version.
2010-04-14 19:43:19 +02:00
Benoit Boissinot
02bda9ab1a merge with stable 2010-04-14 11:27:15 +02:00
Steve Borho
b31717c291 verify: improve progress descriptions
For GUIs, the progress bar is disconnected visually from the text that
is output by ui.write(), so it's better to be a little bit redundant in
naming the status.  "checking" is redundant, since the user is running
the verify command.  'changesets', 'manifests', etc, tell the user what
is being checked (the entity being counted in the progress bar.
2010-04-13 23:12:23 -05:00
Nicolas Dumazet
7f1a963829 pylint, pyflakes: remove unused or duplicate imports 2010-04-14 17:58:10 +09:00
Benoit Boissinot
18b2a0f2b6 merge with stable 2010-04-14 09:09:43 +02:00
Greg Ward
01987f5d3e revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
2010-04-13 17:58:38 -04:00
Benoit Boissinot
efb1d7e8a0 fix test-pull after a105081fbbac 2010-04-13 23:04:46 +02:00
Benoit Boissinot
4e16e2221b merge with stable 2010-04-13 22:10:24 +02:00
Benoit Boissinot
b8ee2dc847 revlog: put graph related functions together 2010-04-13 22:06:17 +02:00
Matt Mackall
062bdb8d0b check-code: add a warnings level
- demote "unwrapped ui message"
2010-04-12 17:41:32 -07:00
Steve Losh
8551e0d0f2 commands: add more robust support for 'hg log -b' (issue2078)
Fixes issue2078 and adds tests to cover various 'hg log -b' uses.

This change adds a localrepo.lookupbranch(key, remote=None) function. This
will look up the branch of the revision with the given key. The algorithm
works like this:

    * If a remote repo is given and KEY is the name of a branch in that repo,
      return KEY.
    * If no remote repo is given and KEY is the name of a branch in the local
      repo object, return KEY.
    * Otherwise look up the revision with the identifier KEY in the local repo
      and return its branch.

This change also makes 'hg log -b' use this new functionality and adds a few
tests for it.
2010-04-12 19:33:25 -04:00
Matt Mackall
91d4d9f28f highlight: fix to work with caching templater 2010-04-19 16:47:44 -05:00
Matt Mackall
28f56d970a debugcomplete: don't list deprecated options 2010-04-19 16:47:44 -05:00
Steve Losh
6a47111c36 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Switching to --branch makes log consistent with push/pull and make more sense
given the actual behavior of the option (you can specify -b multiple times to
include multiple branches).

This change also adds some tests for 'hg log -b'.
2010-04-18 18:18:19 -04:00