Joshua Redstone
5d6b6b4a44
dirstate: add dir/file collision test
...
Add a test exercising collisions in add between files and directories of the
same name.
2012-06-27 12:28:26 -07:00
Joshua Redstone
bb82354578
dirstate: factor common update code into _addpath
...
Factor update code common to all callers of _addpath into _addpath.
By centralizing the update code here, it provides one place to put
updates to new data structures - in a future patch. It also removes
a few lines of duplicate code.
2012-06-18 08:06:42 -07:00
Adrian Buehlmann
d0ed8e9722
test-subrepo-relative-path: partially adapt for Windows
2012-07-02 16:54:01 +02:00
Mads Kiilerich
e3835ef5ff
tests: make rm of usercache in test-largefiles.t more robust
...
Recursive removal of a different path could be fatal - better avoid recursive
rm completely.
2012-07-03 01:49:51 +02:00
Matt Mackall
f52103b924
merge with stable
2012-07-01 21:20:30 -05:00
Matt Mackall
12d4bcf86f
merge with crew
2012-07-01 21:19:57 -05:00
Mads Kiilerich
0585ab3757
tests: enable test-largefiles.t on Windows MSYS
...
The 'serve' requirement is moved to the sections that really need it.
$USERCACHE needs quoting.
2012-07-02 01:48:12 +02:00
Adrian Buehlmann
4c34d29e62
test-largefiles: partially adapt for Windows
...
The adaption is partial, because "serve" is not yet officially supported in
tests on Windows.
The test passes on Windows with an experimental testbed that supports
hg serve in tests on Windows - except for some USERCACHE issues.
The added (glob)'s are needed because of backslash <-> shlash issues in paths.
2012-06-30 19:31:03 +02:00
Mads Kiilerich
e1e9922b2d
tests: make histedit pass on Windows MSYS
...
The command file will now be named with $TESTTMP (with '\') instead of `pwd`
(with '/') to avoid wrong path conversions.
2012-07-02 01:47:59 +02:00
Mads Kiilerich
9fd035159b
tests: make histedit tests more resilient to filesystem variation
...
Better quoting of odd filesystem paths and no dependency to execute bit.
2012-06-30 03:34:50 +02:00
Mads Kiilerich
db710d2031
tests: convert histedit tests to .t
...
Mostly a trivial conversion.
2012-06-30 03:34:44 +02:00
Mads Kiilerich
7c32277ff3
histedit: use stable iteration order for processing bookmarks
...
Random dict iteration order caused test failure in
test-histedit-bookmark-motion.t.
2012-06-30 03:34:41 +02:00
Matt Mackall
cb4824284b
merge with stable
2012-06-06 21:17:33 -05:00
Matt Mackall
af2bb57f5a
merge with i18n
2012-06-06 21:17:20 -05:00
Brad Hall
6b8032746f
tag: don't allow tagging the null revision (issue1915)
...
Also fixed the tests that were doing this and expected it to work
2012-06-05 17:00:13 -07:00
FUJIWARA Katsunori
5f3de0edc0
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
2012-07-26 13:58:43 +09:00
FUJIWARA Katsunori
26c5c2b610
revset: use appropriate predicate name in error messages
...
"extinct" and "unstable" predicates use "obsolete" implementation
internally, but own predicate name should be used in error messages of
them instead of "obsolete".
2012-07-26 13:58:43 +09:00
Adrian Buehlmann
41df87291e
test-histedit-fold: fix for Windows
...
Fixes 6d445c2db0df failing with MSYS.
MSYS sh.exe mangled that path by applying its path magic, which caused the
test to fail on Windows.
2012-07-26 23:08:34 +02:00
Matt Mackall
b4b5dd8c01
tags: visit new heads in forward order when rebuilding cache
...
This improves performance of building the tag cache by 4x on a repo
with ~2800 heads.
2012-07-26 17:04:01 -05:00
Pierre-Yves.David@ens-lyon.org
3c02b8eab1
obsolete: function and method to access some obsolete data
...
An `obsolete` boolean property is added to changeset context. Function to get
obsolete marker object from a changeset context are added to the obsolete
module.
2012-06-06 01:56:58 +02:00
Pierre-Yves.David@ens-lyon.org
d60eedc2d6
obsolete: exchange obsolete marker over pushkey
...
For a version of the exchange, all markers are exchange. This won't
scale and we will need a better protocol later.
2012-06-07 19:21:59 +02:00
Pierre-Yves.David@ens-lyon.org
715c9d5f3e
debugobsolete: list all obsolete marker if no argument are specified
2012-06-07 19:20:44 +02:00
Adrian Buehlmann
519e4c0d6f
test-add: enable for Windows
2012-06-05 22:46:14 +02:00
Adrian Buehlmann
dc41c6e820
test-addremove: remove bits about con.xml
...
Windows reserved filename warnings are already enough tested in test-add.t.
This enables the test for Windows.
2012-06-05 23:13:45 +02:00
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
