Commit Graph

17005 Commits

Author SHA1 Message Date
Bryan O'Sullivan
1de6d211c8 util: simplify queue management in chunkbuffer
This also fixes a small wire protocol performance regression.
2012-06-05 16:52:20 -07:00
Kevin Bullock
926372b575 update: fix help regarding update to ancestor
As pointed out on the user mailing list, hg will update just as happily
to an ancestor if there are uncommitted changes as to a descendant.
2012-06-05 13:33:52 -05:00
Jim Hague
1b46810a77 bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484)
Bugs should only be marked fixed if the comment parser gives them the
fixed state. xmlrpc+email got this right, xmlrpc screwed it up.
2012-06-06 16:44:17 +01:00
Wagner Bruna
bead143dc2 merge with i18n 2012-06-05 10:09:17 -03:00
Alexander Sauta
f41df0a97b i18n-ru: synchronized with 85940498c8b0 2012-06-05 07:57:04 +01:00
Matt Mackall
49a9d0006f help: drop -a from heads syntax summary (issue3483) 2012-06-04 17:22:09 -05:00
Idan Kamara
897b2d782b graft: restore config option on correct ui 2012-06-04 15:43:16 +03:00
wujek srujek
a4762c56c6 hgweb: fixes linebreak location in gitweb filediff.tmpl view
It is consistent with other templates now and doesn't cause the help link to
(incorrectly) appear on the next line.
2012-06-04 18:03:23 +02:00
Pierre-Yves.David@ens-lyon.org
1cc1e699cb obsolete: add easy way to iterate over obsolete marker object 2012-06-04 00:50:19 +02:00
Pierre-Yves.David@ens-lyon.org
3659d103ff obsolete: helper class to access obsolete marker data 2012-06-07 19:19:58 +02:00
Pierre-Yves.David@ens-lyon.org
0d5addf62d command: creation of obsolete marker
* add metadata encoding/decoding ability

* add a method to obsstore to help creating marker

* add a debug command to create marker
2012-06-07 19:15:23 +02:00
Pierre-Yves.David@ens-lyon.org
f9dd15112c obsolete: introduction of obsolete markers
Markers are stored as binary records in a log structured file in
.hg/store/obsstore.
2012-06-07 19:07:39 +02:00
Matt Mackall
0fcdc937c2 Added signature for changeset a1e1826de33a 2012-06-01 23:48:27 -05:00
Matt Mackall
f6aed3cb78 merge with i18n 2012-06-01 15:14:13 -05:00
Bryan O'Sullivan
ca79cf4afa scmutil: seen.union should be seen.update (issue3476) 2012-05-31 20:55:30 -07:00
Patrick Mezard
5315858d38 patch: keep patching after missing copy source (issue3480)
When applying a patch renaming/copying 'a' to 'b' on a revision where
'a' does not exist, the patching process would abort immediately,
without processing the remaining hunks and without reporting it. This
patch makes the patching no longer abort and possible hunks applied on
the copied/renamed file be written in reject files.
2012-06-01 17:37:56 +02:00
Wagner Bruna
91fd22d273 i18n-pt_BR: synchronized with 9afcfbca1710 2012-05-31 21:47:40 -03:00
Elifarley Callado Coelho Cruz
6010752603 acl: user docs for the "!" prefix in user or group names 2012-05-30 21:47:51 -03:00
Matt Mackall
2d85685b68 merge with i18n 2012-05-30 14:31:29 -05:00
Matt Mackall
d4e4a5b5be revpair: handle odd ranges (issue3474) 2012-05-30 14:13:57 -05:00
Idan Kamara
6259990e39 localrepo: clear _filecache earlier to really force reloading (issue3462)
b67b333b0d8a attempted to force the filecaches in localrepo to reload
everything after a rollback. But simply clearing _filecache isn't enough,
invalidate() needs to be called before/after. localrepo._rollback calls
invalidate() already, so we clear the map right afterwards which ensures
everything will be reread.
2012-05-29 18:27:12 +03:00
FUJIWARA Katsunori
53d7bfd5d8 i18n-ja: synchronized with 878641b4f1d3 2012-05-29 21:32:50 +09:00
David Champion
fe8fba0ab7 notify: various fixes to docstring
Typo corrections, grammar adjustments, clarity improvements.
2012-05-29 07:07:10 -05:00
Matt Mackall
601be58425 merge with crew 2012-06-12 16:20:20 -05:00
Thomas Arendsen Hein
0c30f8dca5 archive: make progress only show files that are actually archived
Before this, files that are excluded (or not included) were shown when
using progress bar or --debug.

Reported by Andrew Shadura.
2012-06-12 12:05:52 +02:00
Alexander Boyd
dbb21eba13 statichttprepo: don't send Range header when requesting entire file
When requesting files using statichttprepo.httprangereader, a request for the
entire file is sent with a Range: bytes=0- header. This causes problems with
web servers such as Cherokee that return an HTTP 416 when an empty file is
requested in this way, which in turn cause some repository clone attempts to
fail. This patch omits the Range header when the entire file is being
requested, which fixes the problem.
2012-06-09 19:13:24 -06:00
Elifarley Callado Coelho Cruz
589d45cced acl: use of "!" prefix in user or group names
The "!" prefix allows you to prevent anyone except a given user or group to push
changesets in a given branch or path.

This patch enables a use case suggested by a user (Julien Bonnet):
There's a branch that only a given user (or group) should be able to push to,
and you don't want to restrict access to any other branch that may be created.

With the "!" prefix, you simply deny access to "!givenuser" (or "!@givengroup").
2012-05-28 19:45:15 -03:00
Bryan O'Sullivan
ce2a30609e parsers: add a C function to pack the dirstate
This is about 9 times faster than the Python dirstate packing code.
The relatively small speedup is due to the poor locality and memory
access patterns caused by traversing dicts and other boxed Python
values.
2012-05-30 12:55:33 -07:00
Eduard-Cristian Stefan
112aea1890 test-convert: disable autocrlf for git 2012-06-08 05:31:28 +03:00
Adrian Buehlmann
53aa68cb2c debugwalk: observe ui.slash config option 2012-06-11 11:15:14 +02:00
Martin Geisler
f92437e97c merge with stable 2012-06-13 20:14:28 +02:00
Mads Kiilerich
8a58b3e3c1 help: sort results from keyword search 2012-06-13 02:44:46 +02:00
Mads Kiilerich
021b623928 tests: reintroduce globs in test-convert-authormap.t
They are needed on windows and were accidentally removed in de665be9a988.
2012-06-13 02:29:47 +02:00
Matt Mackall
4860c2a926 merge with stable 2012-06-12 16:20:38 -05:00
Elifarley Callado Coelho Cruz
5927f8f943 tests: removed unneeded section in acl configuration: 'extensions'
Declaring 'acl' in the [extensions] section doesn't change anything.
2012-06-01 11:15:00 -03:00
Bryan O'Sullivan
229aceade4 config: use util.compilere to compile regexps 2012-06-01 15:26:46 -07:00
Bryan O'Sullivan
3f45806d34 matcher: use re2 bindings if available
There are two sets of Python re2 bindings available on the internet;
this code works with both.

Using re2 can greatly improve "hg status" performance when a .hgignore
file becomes even modestly complex.

Example: "hg status" on a clean tree with 134K files, where "hg
debugignore" reports a regexp 4256 bytes in size.

  no .hgignore: 1.76 sec
  Python re:    2.79
  re2:          1.82

The overhead of regexp matching drops from 1.03 seconds with stock
re to 0.06 with re2.

(For comparison, a git repo with the same contents and .gitignore
file runs "git status -s" in 1.71 seconds, i.e. only slightly faster
than hg with re2.)
2012-06-01 15:26:20 -07:00
Olav Reinert
7c9defd0db help: fix extension commands help in keyword search
This patch fixes the synopsis shown for extension commands in keyword search
results. A previous patch erroneously caused the extension synopsis to be shown
instead.

Test cases for keyword search are missing, so I added a one.
2012-06-07 01:42:50 +02:00
Martin Geisler
9b2274c69f localrepo: lowercase "unexpected response" message 2012-06-12 14:18:18 +02:00
Martin Geisler
2fb6d24292 ui: lowercase "no username" warning 2012-06-12 14:18:18 +02:00
Martin Geisler
85338c4193 ui: lowercase "not trusting file" warning message 2012-06-12 14:18:18 +02:00
Martin Geisler
d599cd6742 ui: lowercase ConfigError warning message 2012-06-12 14:18:18 +02:00
Martin Geisler
50cde07b26 cmdutil: lowercase finddate status message
This message is output by 'hg revert -d DATE' and 'hg update -d DATE'.
2012-06-12 14:18:18 +02:00
Martin Geisler
1b024d518a bisect: lowercase status message 2012-06-12 14:18:18 +02:00
Martin Geisler
a06bcd028f serve: lowercase "no repo here" message 2012-06-12 14:18:18 +02:00
Martin Geisler
7b0a61680f debuginstall: lowercase status messages 2012-06-12 14:18:18 +02:00
Martin Geisler
65ea7aa7d4 dispatch: lowercase --time message 2012-06-12 14:18:18 +02:00
Martin Geisler
78f77d335e win32text: lowercase warning message 2012-06-12 14:18:18 +02:00
Martin Geisler
cae2421779 patchbomb: lowercase status messages 2012-06-12 14:18:18 +02:00
Martin Geisler
a987a9f256 purge: lowercase messages 2012-06-12 14:18:18 +02:00