log
graph
tags
bookmarks
branches
changeset
raw
browse
help
Mercurial
>
hg
>
compact-paper
changeset 21926:
6c36dc6cd61a
stable
3.1-rc
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
merge default into stable for 3.1 code freeze
author
Matt Mackall <mpm@selenic.com>
date
Sat, 19 Jul 2014 00:10:22 -0500
parents
584bbfd1b50d
(current diff)
7142e04b438e
(
diff
)
children
934c454dd231
files
tests/test-run-tests.t
diffstat
206 files changed, 9603 insertions(+), 4286 deletions(-)
[
+
]
[
-
]
.hgignore
2
Makefile
33
contrib/bash_completion
2
contrib/buildrpm
31
contrib/check-code.py
52
contrib/debugshell.py
9
contrib/docker/centos6
7
contrib/docker/fedora
6
contrib/dockerrpm
14
contrib/hgfixes/fix_bytes.py
7
contrib/mercurial.spec
27
contrib/mergetools.hgrc
7
contrib/revsetbenchmarks.py
45
contrib/revsetbenchmarks.txt
3
contrib/synthrepo.py
4
contrib/vagrant/README.md
4
contrib/vagrant/Vagrantfile
14
contrib/vagrant/provision.sh
10
contrib/vagrant/run-tests.sh
13
contrib/vim/hgcommand.vim
4
doc/check-seclevel.py
3
doc/gendoc.py
3
hg
5
hgext/children.py
21
hgext/churn.py
41
hgext/color.py
12
hgext/convert/__init__.py
97
hgext/convert/common.py
11
hgext/convert/convcmd.py
10
hgext/convert/git.py
33
hgext/convert/hg.py
34
hgext/convert/subversion.py
7
hgext/extdiff.py
31
hgext/factotum.py
2
hgext/fetch.py
29
hgext/gpg.py
4
hgext/graphlog.py
5
hgext/hgk.py
70
hgext/histedit.py
26
hgext/keyword.py
19
hgext/largefiles/__init__.py
4
hgext/largefiles/lfcommands.py
54
hgext/largefiles/lfutil.py
8
hgext/largefiles/overrides.py
100
hgext/mq.py
118
hgext/pager.py
46
hgext/patchbomb.py
6
hgext/progress.py
14
hgext/purge.py
33
hgext/rebase.py
9
hgext/record.py
15
hgext/relink.py
13
hgext/share.py
22
hgext/shelve.py
29
hgext/strip.py
21
hgext/transplant.py
8
mercurial/branchmap.py
5
mercurial/bundle2.py
219
mercurial/changegroup.py
29
mercurial/cmdutil.py
255
mercurial/commands.py
369
mercurial/config.py
51
mercurial/context.py
464
mercurial/demandimport.py
12
mercurial/dirs.c
19
mercurial/dirstate.py
23
mercurial/discovery.py
4
mercurial/dispatch.py
3
mercurial/encoding.py
93
mercurial/error.py
19
mercurial/exchange.py
236
mercurial/extensions.py
19
mercurial/fancyopts.py
2
mercurial/filemerge.py
95
mercurial/help.py
21
mercurial/help/config.txt
94
mercurial/help/templates.txt
16
mercurial/hg.py
29
mercurial/hook.py
8
mercurial/i18n.py
6
mercurial/localrepo.py
169
mercurial/manifest.py
12
mercurial/match.py
8
mercurial/mdiff.py
1
mercurial/merge.py
672
mercurial/minirst.py
2
mercurial/parsers.c
201
mercurial/patch.py
34
mercurial/pure/parsers.py
8
mercurial/pushkey.py
17
mercurial/py3kcompat.py
9
mercurial/revset.py
39
mercurial/scmutil.py
9
mercurial/simplemerge.py
10
mercurial/subrepo.py
65
mercurial/tagmerge.py
265
mercurial/tags.py
51
mercurial/templatefilters.py
6
mercurial/templatekw.py
29
mercurial/templater.py
40
mercurial/templates/atom/changelogentry.tmpl
2
mercurial/templates/rss/changelogentry.tmpl
2
mercurial/templates/rss/filelogentry.tmpl
2
mercurial/util.h
11
mercurial/util.py
115
mercurial/wireproto.py
78
setup.py
2
tests/autodiff.py
16
tests/filterpyflakes.py
17
tests/run-tests.py
2238
tests/test-add.t
1
tests/test-backout.t
34
tests/test-basic.t
1
tests/test-bookmarks-current.t
4
tests/test-bookmarks-merge.t
6
tests/test-bookmarks-pushpull.t
5
tests/test-bookmarks-strip.t
1
tests/test-bookmarks.t
4
tests/test-bundle2.t
317
tests/test-check-code-hg.t
29
tests/test-check-code.t
16
tests/test-check-pyflakes.t
3
tests/test-command-template.t
125
tests/test-commandserver.py
3
tests/test-commandserver.py.out
3
tests/test-commit-amend.t
35
tests/test-commit-unresolved.t
1
tests/test-commit.t
42
tests/test-completion.t
6
tests/test-conflict.t
183
tests/test-context.py
22
tests/test-context.py.out
9
tests/test-convert-hg-sink.t
147
tests/test-convert-hg-source.t
1
tests/test-convert-svn-sink.t
1
tests/test-copy-move-merge.t
8
tests/test-diff-binary-file.t
4
tests/test-double-merge.t
6
tests/test-encoding-align.t
19
tests/test-encoding-textwrap.t
16
tests/test-extension.t
148
tests/test-fetch.t
21
tests/test-fileset.t
1
tests/test-globalopts.t
4
tests/test-gpg.t
11
tests/test-graft.t
63
tests/test-help.t
71
tests/test-hgweb-commands.t
322
tests/test-histedit-arguments.t
32
tests/test-histedit-edit.t
90
tests/test-histedit-fold-non-commute.t
2
tests/test-histedit-fold.t
2
tests/test-histedit-non-commute.t
4
tests/test-import-bypass.t
10
tests/test-import.t
304
tests/test-issue1877.t
1
tests/test-issue3084.t
15
tests/test-issue672.t
10
tests/test-journal-exists.t
3
tests/test-keyword.t
6
tests/test-largefiles-misc.t
835
tests/test-largefiles-wireproto.t
293
tests/test-largefiles.t
931
tests/test-lfconvert.t
1
tests/test-log.t
2
tests/test-merge-commit.t
4
tests/test-merge-criss-cross.t
34
tests/test-merge-revert2.t
4
tests/test-merge-tools.t
52
tests/test-merge-types.t
23
tests/test-merge7.t
7
tests/test-mq-qfold.t
92
tests/test-mq-qnew.t
79
tests/test-mq-qrefresh-replace-log-message.t
135
tests/test-obsolete-divergent.t
8