Commits

Author Commit Message Labels Comments Date
lunaria
merge upstream
Matt Mackall
merge with stable
Matt Mackall
merge with crew
Matt Mackall
merge with i18n
Branches
stable
Katsunori FUJIWARA
i18n-ja: synchronized with 2478594b37c2
Branches
stable
Alexander Sauta
i1n-ru:synchronized with b748106fe616
Branches
stable
Wagner Bruna
i18n-pt_BR: synchronized with 0a730d3c5aae
Branches
stable
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein
merge: warn about file deleted in one branch and renamed in other (issue3074) For divergent renames the following message is printed during merge: note: possible conflict - file was renamed multiple times to: newfile file2 When a file is renamed in one branch and deleted in the other, the file still exists after a merge. With this change a similar message is printed for mv+rm: note: possible conflict - file was deleted and renamed to: newfile
Thomas Arendsen Hein
tests: do not create repos inside repos in test-rename-merge1.t This is no actual problem, but I when adding more tests to this file, the directory structure would become t/repo2089/repoXXXX/repoYYYY/...
Thomas Arendsen Hein
merge: do not warn about copy and rename in the same transaction (issue2113)
Matt Mackall
merge with stable
Matt Mackall
revpair: handle odd ranges (issue3474)
Branches
stable
Katsunori FUJIWARA
match: make 'match.files()' return list object always 'exact' match objects are sometimes created with a non-list 'pattern' argument: - using 'set' in queue.refresh():hgext/mq.py match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs)) - using 'dict' in revert():mercurial/cmdutil.py (names = {}) m = scmutil.matchfiles(repo, names) 'exact' match objects return specified 'pattern' to callers of 'match.files()' as it i…
Branches
stable
Bryan O'Sullivan
perf: add a perfdirstatewrite benchmark
Bryan O'Sullivan
parsers: cache the result of index_headrevs Although index_headrevs is much faster than its Python counterpart, it's still somewhat expensive when history is large. Since headrevs is called several times when the tag cache is stale or missing (e.g. after a strip or rebase), there's a win to be gained from caching the result, which we do here.
Bryan O'Sullivan
revlog: switch to a C version of headrevs The C implementation is more than 100 times faster than the Python version (which is still available as a fallback). In a repo with 330,000 revs and a stale .hg/cache/tags file, this patch improves the performance of "hg tip" from 2.2 to 1.6 seconds.
Bryan O'Sullivan
perf: rework perfheads and perftags to clear caches The cache clearing makes numbers more reproducible.
Bryan O'Sullivan
parsers: reduce raw_length when truncating When stripping revs, we now update raw_length to correctly reflect the new end of the index.
Olav Reinert
help: inline helper function used once only
Olav Reinert
help: remove redundant parameter
Olav Reinert
help: move some helper functions to help.py
Olav Reinert
help: remove dependency on ui from some helper functions
David Schleimer
hg-ssh: refactor to have main() method Refactor hg-ssh to have a main() function instead of a bunch of top-level statements.
Matt Mackall
merge with stable
Patrick Mézard
graphlog: turn getlogrevs() into a generator This improves the poor "time to first changeset" compared to the original log command. When running: $ hg log -u user log will enumerate the changelog and display matching revisions when they are found. But: $ hg log -G -u user will first find all revisions matching the user then start to display them. Initially, I considered turning revset.match() into a generator. This is doable but req…
Patrick Mézard
cmdutil: extract increasing_windows() from walkchangerevs() It will be reused in the revset-based version.
Augie Fackler
httpclient: omit tests for the client since we don't run them anyway
Augie Fackler
httpclient: update to c5abd358e543 of httpplus
Paul Boddie
hgweb: make graph data suitable for template usage Previously, graph data has been encoded for processing done by JavaScript code run in the browser, employing simple structures with implicit member positions. This patch modifies the graph command to also produce data employing a dictionary-based structure suitable for use with the templating mechanism, thus permitting other ways of presenting repository graphs using that mechanism. In order to t…
  1. Prev
  2. Next