Commits

Show all
Author Commit Message Labels Comments Date
Matt Mackall
merge with crew
Tags
2.3.1
Branches
stable
Martin Schröder
i18n-de: synchronized with 20665910d9d9; fix Bug 3082
Branches
stable
Wagner Bruna
i18n-pt_BR: synchronized with bdd248666dbc
Branches
stable
Wagner Bruna
merge with i18n
Branches
stable
Patrick Mézard
convert: use subprocess for all commandline calls Avoid mixing popen and subprocess calls, it simplifies the command line generation and quoting issues with redirections. In practice, it fixes the subversion sink on Windows and probably helps with monotone and darcs sources.
Branches
stable
Patrick Mézard
convert: make commandline.limit_arglist private, simplify
Branches
stable
Matt Harbison
largefiles: adjust localstore to handle batch statlfile requests (issue3583) This fixes a traceback when pushing to a local repo which started with 9e1616307c4c.
Branches
stable
Pierre-Yves David
strip: fix revset usage (issue3604) The `repair` code builds a giant revset query instead of using the "%lr" idiom. It is inefficient and crash when the number of stripped changeset is too big. This changeset replaces the bad code by a better revset usage.
Branches
stable
Matt Mackall
merge with i18n
Branches
stable
Katsunori FUJIWARA
i18n-ja: synchronized with 9d9d15928521
Branches
stable
Steve Borho
obsolete: import modules within mercurial/ without "from mercurial"
Branches
stable
John Li
tests: merging bookmarked heads 45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.
Branches
stable
Adrian Buehlmann
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.…
Branches
stable
Ross Lagerwall
util: replace util.nulldev with os.devnull Python since 2.4 has supported os.devnull so having util.nulldev is unnecessary.
Branches
stable
Steve Borho
wix: bump MSI based installers to use Python 2.7 We're somewhat forced to use Python 2.7 for the bdist packages, so we might as well use 2.7 for the MSI installers as well.
Branches
stable
John Li
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 4a02cf4fbb2e. This catches that case and prints an error to specify a rev explicitly.
Branches
stable
Patrick Mézard
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]
Branches
stable
Matt Mackall
merge heads in stable
Branches
stable
Matt Mackall
commit: normalize filenames when checking explicit files (issue3576)
Branches
stable
Bryan O'Sullivan
store: only one kind of OSError means "nonexistent entry"
Branches
stable
Bryan O'Sullivan
store: sort the results of fncachestore.datafiles()
Branches
stable
Patrick Mézard
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.
Branches
stable
Patrick Mézard
debugfileset: implement --rev, more tests
Branches
stable
Patrick Mézard
test-fileset: test remaining predicates - exec - symlink - size - resolved / unresolved - subrepo
Branches
stable
Patrick Mézard
fileset: do not traceback on invalid grep pattern
Branches
stable
Patrick Mézard
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.
Branches
stable
Patrick Mézard
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.
Branches
stable
Patrick Mézard
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.
Branches
stable
Patrick Mézard
test-fileset: test file status predicates
Branches
stable
Patrick Mézard
fileset: actually implement 'minusset' $ hg debugfileset 'a* - a1' was tracing back because 'minus' symbol was not supported.
Branches
stable
  1. Prev
  2. Next