Mads Kiilerich
48016eb3fc
declare local constants instead of using magic values and comments
2012-08-27 23:16:22 +02:00
Mads Kiilerich
5e3dc3e383
avoid using abbreviations that look like spelling errors
2012-08-27 23:14:27 +02:00
Mads Kiilerich
e973af65d0
improve some comments and docstrings, fixing issues found when spell checking
2012-08-21 02:41:20 +02:00
Mads Kiilerich
520076e707
delete some dead comments and docstrings
2012-08-21 02:41:20 +02:00
Mads Kiilerich
2372d51b68
fix wording and not-completely-trivial spelling errors and bad docstrings
2012-08-15 22:39:18 +02:00
Mads Kiilerich
2f4504e446
fix trivial spelling errors
2012-08-15 22:38:42 +02:00
Matt Mackall
ec8f1367b5
merge with stable
2012-08-28 17:59:08 -05:00
Steve Borho
029f4079a2
obsolete: import modules within mercurial/ without "from mercurial"
2012-08-28 11:15:34 -05:00
Matt Mackall
36c5db3d78
merge with stable
2012-08-24 17:51:47 -05:00
Adrian Buehlmann
5b16379fd5
debuginstall: show directory for Python lib
...
Example new output
on Windows:
$ hg debuginstall
checking encoding (cp1252)...
checking Python lib (C:\Users\adi\hgrepos\hg-main\hg-python\lib)...
checking installed modules (C:\Users\adi\hgrepos\hg-main\mercurial)...
checking templates (C:\Users\adi\hgrepos\hg-main\mercurial\templates)...
checking commit editor...
C:\Program Files (x86)\Notepad++\notepad++.exe
checking username...
no problems detected
on Linux:
adi@kork-ubuntu64:~/hgrepos/hg-main$ ./hg debuginstall
checking encoding (UTF-8)...
checking Python lib (/usr/lib/python2.7)...
checking installed modules (/home/adi/hgrepos/hg-main/mercurial)...
checking templates (/home/adi/hgrepos/hg-main/mercurial/templates)...
checking commit editor...
checking username...
no problems detected
2012-08-06 12:59:47 +02:00
Patrick Mezard
7acf48f9a1
revset: add hidden() revset
2012-08-04 20:20:48 +02:00
Matt Mackall
04ee099a4c
merge with stable
2012-08-24 14:53:07 -05:00
John Li
8400b38f0d
merge: handle case when heads are all bookmarks
...
If all heads are bookmarks, merge fails to find what node to merge
with (throws an IndexError while indexing into the non-bookmark heads
list) as of 208ca72b9343. This catches that case and prints an error
to specify a rev explicitly.
2012-08-22 11:18:35 -04:00
Bryan O'Sullivan
3234b8f8c6
Merge
2012-08-21 13:12:56 -07:00
Patrick Mezard
1e03a5cb1d
verify: do not choke on valid changelog without manifest
...
Before this change:
$ hg init
$ hg branch foo
$ hg ci -m branchfoo
$ hg verify
checking changesets
checking manifests
0: empty or missing manifest
crosschecking files in changesets and manifests
checking files
0 files, 1 changesets, 0 total revisions
1 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
2012-08-21 20:51:16 +02:00
Matt Mackall
fdc58e8172
merge with stable
2012-08-21 12:27:57 -05:00
Matt Mackall
b1f6dfb8ee
merge heads in stable
2012-08-21 12:26:53 -05:00
Neil Kodner
68912667a4
templater: abort when a template filter raises an exception (issue2987)
2012-08-17 15:12:01 -07:00
Matt Mackall
30afcc9869
commit: normalize filenames when checking explicit files (issue3576)
2012-08-17 14:37:59 -05:00
Adrian Buehlmann
0d13ec9185
manifest: remove redundant sorted() call for --all
...
repo.store.datafiles() is now already sorted (for all types of stores).
A follow-up to 9dc699058c9e.
2012-08-16 13:57:43 +02:00
Bryan O'Sullivan
44ed6ea941
Merge from crew-stable
2012-08-15 16:33:26 -07:00
Bryan O'Sullivan
14c8cfede7
store: only one kind of OSError means "nonexistent entry"
2012-08-15 16:31:25 -07:00
Bryan O'Sullivan
d5c4b2870d
store: sort the results of fncachestore.datafiles()
2012-08-15 16:30:32 -07:00
Patrick Mezard
0f353320b5
Merge with stable
2012-08-15 23:03:40 +02:00
Patrick Mezard
57f8b328dc
fileset: fix generator vs list bug in fast path
...
$ hg debugfileset 'a or b'
would only return a or b but not both because the base file list was a
generator instead of a replayable sequence.
2012-08-15 22:50:23 +02:00
Patrick Mezard
04200aa71a
debugfileset: implement --rev, more tests
2012-08-15 22:28:32 +02:00
Patrick Mezard
afc53271b1
fileset: do not traceback on invalid grep pattern
2012-08-15 19:25:45 +02:00
Patrick Mezard
5874c142ff
fileset: matchctx.existing() must consider ignored files
...
When running:
$ hg debugfileset 'binary() and ignored()'
getfileset() was correctly retrieving ignored files but
matchctx.existing() was not taking them in account. Just add them along
with unknown files.
2012-08-15 22:29:32 +02:00
Patrick Mezard
faab1846cc
fileset: matchctx.existing() must consider unknown files
...
By default, unknown files are ignored. If the 'unknown()' predicate
appears in the syntax tree, then they are taken in account.
Unfortunately, matchctx.existing() was filtering against non-deleted
context files, which does not include unknown files. So:
$ hg debugfileset 'binary() and unknown()'
would not return existing binary unknown files.
2012-08-15 22:29:09 +02:00
Patrick Mezard
663673858e
fileset: exclude deleted files from matchctx.existing()
...
Running:
$ hg debugfileset 'binary()'
would traceback if there were one deleted file in the working directory.
It happened because matchctx.existing() was filtering files against the
ctx.__contains__() but deleted files are still considered part of
workingctx.
2012-08-15 21:44:00 +02:00
Patrick Mezard
95df23a5ab
fileset: actually implement 'minusset'
...
$ hg debugfileset 'a* - a1'
was tracing back because 'minus' symbol was not supported.
2012-08-15 19:02:04 +02:00
Sune Foldager
d0f83be327
merge with stable
2012-08-15 12:12:21 +02:00
Sune Foldager
801d60844a
rollback: write dirstate branch with correct encoding
2012-08-15 12:04:50 +02:00
Bryan O'Sullivan
d0fee76f96
Merge
2012-08-14 08:12:09 -07:00
Bryan O'Sullivan
4045197307
parsers: fix an integer size warning issued by clang
2012-08-13 14:04:52 -07:00
Patrick Mezard
f5640dfc77
Merge with stable
2012-08-08 21:38:53 +02:00
Adrian Buehlmann
9a52491dad
update: fix typo in help text
...
Spotted by Kevin Chase <kevincha99@hotmail.com>
2012-08-06 10:45:11 +02:00
Augie Fackler
5200764eb8
clone: don't fail with --update for non-local clones (issue3578)
...
This was broken by e01343f7da6f due to lack of test coverage. This
adds a test and fixes the defect.
2012-08-08 10:04:02 -05:00
Patrick Mezard
8474815dad
Merge with stable
2012-08-04 15:58:23 +02:00
Ross Lagerwall
661779d660
util: replace util.nulldev with os.devnull
...
Python since 2.4 has supported os.devnull so having util.nulldev
is unnecessary.
2012-08-04 07:14:40 +02:00
Patrick Mezard
dd04aa1b66
Merge with stable
2012-08-02 18:33:40 +02:00
Patrick Mezard
5d1bd7fadf
context: simplify workingctx._parents
2012-08-02 17:48:58 +02:00
sorcerer
b04ae8ca03
revlog: don't try to partialmatch strings those length > 40
...
_partialmatch() does prefix matching against nodes. String passed
to _partialmetch() actualy may be any string, not prefix only.
For example,
"63af8381691a9e5c52ee57c4e965eb306f86826e or 300" is a good
argument for _partialmatch().
When _partialmatch() searches using radix tree, index_partialmatch()
C function shouldn't try to match too long strings.
2012-08-02 19:10:45 +04:00
Ross Lagerwall
48a670fcaf
templater: handle a missing value correctly
...
Before, using a broken style such as:
changeset =
would result in a traceback.
This fixes a regression introduced in 47618355ffc8.
2012-08-04 14:37:17 +02:00
Javi Merino
7f1365342e
help/hgweb: fix spelling error
2012-08-04 12:29:53 +02:00
Idan Kamara
45c5c92f05
localrepo: clear the filecache on _rollback() and destroyed()
...
This restores the old behaviour of clearing the filecache when the repo is
destroyed but combines it with also clearing it on _rollback. Before, we tried
to only call it through _rollback but that ruined callers of destroyed.
Doing it on both code paths covers destroyed being called from somewhere
else, e.g. strip.
2012-07-28 22:40:30 +03:00
Mads Kiilerich
21e1a1a932
help: add 'mergetools' alias for the 'merge-tools' help topic
...
The '-' in 'merge-tools' is surprising but necessary in the configuration.
Let's help those who forget that and are looking for help.
2012-08-01 00:20:10 +02:00
Mads Kiilerich
4d30442bbe
help: use the first topic name from helptable, not the longest alias
...
This makes the 'additional help topics' list consistent with the output from
keyword search (for instance subrepo/subrepos).
The sorting by longest name was introduced in 4cbe49492ad3. There might have
been a good reason for it back then, but now it seems like a better idea to
place the preferred name first in the list in helptable.
2012-08-01 14:59:15 +02:00
Mads Kiilerich
ae7b3c7a3b
help: fix helptable indentation
2012-08-01 00:18:23 +02:00
Patrick Mezard
5ddea72e60
hgweb: fix graph view paging
...
- Fix off-by-one error on displayed entries count in normal mode
- Fix incorrect paging when the top revision was lower than revcount
- Fix revcount not overriding web.maxshortchanges everywhere
2012-07-29 23:16:20 +02:00
