by
Changes to 191 files · Browse files at 33c882006a1c Showing diff from parent 398f678b2df8 0bfd2f6747ac Diff from another changeset...
@@ -15,3 +15,8 @@ below.
PyGtk: 2.10
+
+=== Python version ===
+
+TortoiseHg needs to run on Python 2.4, to stay consistent with Mercurial
+itself.
|
|
@@ -0,0 +1,25 @@ + ** Please do not run setup.py **
+
+On Linux, the suggested methods for using TortoiseHg are to either
+install a package built for your distribution, or run directly out of a
+cloned repository. For details, see:
+
+http://bitbucket.org/tortoisehg/stable/wiki/download
+
+http://bitbucket.org/tortoisehg/stable/wiki/hgtk
+
+http://bitbucket.org/tortoisehg/stable/wiki/nautilus
+
+
+On Windows, we prefer you use the more recent stable release, which
+can always be found at http://tortoisehg.org
+
+
+If you ran setup.py and are now having troubles with icons, you have two
+choices:
+
+1) Find the tortoisehg/util/config.py file that was installed and
+manually edit it to fixup the paths.
+
+2) Delete the installation and use one of the preferred install methods.
+
|
|
@@ -0,0 +1,31 @@ + Steps for making a release:
+
+* Pull latest translations from Launchpad
+* update ReleaseNotes.txt (major release only)
+* set revision number in tortoisehg/hgtk/gdialog.py (major release only)
+* set revision number in doc/source/conf.py
+* set revision number in win32/shellext/thgversion.h
+* tag stable branch of repository, push
+* build pdf hgbook, check into thg-winbuild (major release only)
+* build release installer
+* commit and tag thg-winbuild
+* create and upload a tarball (python setup.py sdist)
+* upload installer to bitbucket, sourceforge, codeplex
+* update URLs and front page of thg-web
+* update thg-web curversion.txt, commit, push
+* update download wiki page
+* update NEWS on wiki front page
+* build html hgbook, check into thg-web (major release only)
+* upload hgbook pdf to bitbucket (major release only)
+* upload PDF and CHM, update wiki links (major release only)
+* wiki: Move ReleaseNotes to old-release-notes (major release only)
+* wiki: Move FixedBugs or upcoming-release-notes to ReleaseNotes, empty FixedBugs
+* update FAQ entries
+* [ANN] email to tortoisehg-discuss and mercurial@selenic.com
+* Update Mercurial wiki NEWS and Downloads and TortoiseHg pages
+* Add the new version number and new features to the issue tracker
+
+Post Major Release:
+* Increment minimum Mercurial version in tortoisehg/util/hgversion.py
+* Sweep through code and remove hacks for older Mercurial releases
+* Update http://bitbucket.org/tortoisehg/stable/wiki/ReleaseNotes#matching-versions
|
|
|
@@ -3,7 +3,7 @@ # Zsh completion script for hgtk.
# copy it into your zsh function path (/usr/share/zsh/site-functions)
#
-# Copyright (C) 2009 Steve Borho
+# Copyright (C) 2009-2010 Steve Borho
#
# This is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
@@ -59,49 +59,49 @@
if [[ -z "$cmd" ]]
then
- _arguments -s -w : $_hg_global_opts \
- ':hgtk command:_hg_commands'
+ _arguments -s -w : $_hgtk_global_opts \
+ ':hgtk command:_hgtk_commands'
return
fi
# resolve abbreviations and aliases
- if ! (( $+functions[_hg_cmd_${cmd}] ))
+ if ! (( $+functions[_hgtk_cmd_${cmd}] ))
then
local cmdexp
- (( $#_hg_cmd_list )) || _hg_get_commands
+ (( $#_hgtk_cmd_list )) || _hgtk_get_commands
- cmdexp=$_hg_cmd_list[(r)${cmd}*]
- if [[ $cmdexp == $_hg_cmd_list[(R)${cmd}*] ]]
+ cmdexp=$_hgtk_cmd_list[(r)${cmd}*]
+ if [[ $cmdexp == $_hgtk_cmd_list[(R)${cmd}*] ]]
then
# might be nice to rewrite the command line with the expansion
cmd="$cmdexp"
fi
- if [[ -n $_hg_alias_list[$cmd] ]]
+ if [[ -n $_hgtk_alias_list[$cmd] ]]
then
- cmd=$_hg_alias_list[$cmd]
+ cmd=$_hgtk_alias_list[$cmd]
fi
fi
- curcontext="${curcontext%:*:*}:hg-${cmd}:"
+ curcontext="${curcontext%:*:*}:hgtk-${cmd}:"
zstyle -s ":completion:$curcontext:" cache-policy update_policy
if [[ -z "$update_policy" ]]
then
- zstyle ":completion:$curcontext:" cache-policy _hg_cache_policy
+ zstyle ":completion:$curcontext:" cache-policy _hgtk_cache_policy
fi
- if (( $+functions[_hg_cmd_${cmd}] ))
+ if (( $+functions[_hgtk_cmd_${cmd}] ))
then
- _hg_cmd_${cmd}
+ _hgtk_cmd_${cmd}
else
# complete unknown commands normally
- _arguments -s -w : $_hg_global_opts \
+ _arguments -s -w : $_hgtk_global_opts \
'*:files:_hg_files'
fi
}
-_hg_cache_policy() {
+_hgtk_cache_policy() {
typeset -a old
# cache for a minute
@@ -111,27 +111,27 @@ return 1
}
-_hg_get_commands() {
- typeset -ga _hg_cmd_list
- typeset -gA _hg_alias_list
+_hgtk_get_commands() {
+ typeset -ga _hgtk_cmd_list
+ typeset -gA _hgtk_alias_list
local hline cmd cmdalias
_call_program hgtk hgtk debugcomplete -v 2>/dev/null | while read -A hline
do
cmd=$hline[1]
- _hg_cmd_list+=($cmd)
+ _hgtk_cmd_list+=($cmd)
for cmdalias in $hline[2,-1]
do
- _hg_cmd_list+=($cmdalias)
- _hg_alias_list+=($cmdalias $cmd)
+ _hgtk_cmd_list+=($cmdalias)
+ _hgtk_alias_list+=($cmdalias $cmd)
done
done
}
-_hg_commands() {
- (( $#_hg_cmd_list )) || _hg_get_commands
- _describe -t commands 'hgtk command' _hg_cmd_list
+_hgtk_commands() {
+ (( $#_hgtk_cmd_list )) || _hgtk_get_commands
+ _describe -t commands 'hgtk command' _hgtk_cmd_list
}
_hg_revrange() {
@@ -296,7 +296,7 @@}
# Common options
-_hg_global_opts=(
+_hgtk_global_opts=(
'(--repository -R)'{-R+,--repository}'[repository root directory]:repository:_files -/'
'(--verbose -v)'{-v,--verbose}'[enable additional output]'
'(--quiet -q)'{-q,--quiet}'[suppress output]'
@@ -304,76 +304,37 @@ '--debugger[start debugger]'
)
-_hg_pat_opts=(
- '*'{-I+,--include}'[include names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/'
- '*'{-X+,--exclude}'[exclude names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/')
-
-_hg_diff_opts=(
- '(--text -a)'{-a,--text}'[treat all files as text]'
- '(--git -g)'{-g,--git}'[use git extended diff format]'
- "--nodates[don't include dates in diff headers]")
-
-_hg_style_opts=(
- '--style[display using template map file]:'
- '--template[display with template]:')
-
-_hg_commit_opts=(
- '(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]'
- '(-e --edit -l --logfile --message -m)'{-m+,--message}'[use <text> as commit message]:message:'
- '(-e --edit -m --message --logfile -l)'{-l+,--logfile}'[read the commit message from <file>]:log file:_files')
-
-_hg_remote_opts=(
- '(--ssh -e)'{-e+,--ssh}'[specify ssh command to use]:'
- '--remotecmd[specify hg command to run on the remote side]:')
-
_hg_cmd() {
_call_program hg hg "$_hg_cmd_globals[@]" "$@"
}
-_hg_cmd_add() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
+_hgtk_cmd_add() {
+ _arguments -s -w : $_hgtk_global_opts \
'*:unknown files:_hg_unknown'
}
-_hg_cmd_annotate() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--rev -r)'{-r+,--rev}'[annotate the specified revision]:revision:_hg_tags' \
- '(--follow -f)'{-f,--follow}'[follow file copies and renames]' \
- '(--text -a)'{-a,--text}'[treat all files as text]' \
- '(--user -u)'{-u,--user}'[list the author]' \
- '(--date -d)'{-d,--date}'[list the date]' \
- '(--number -n)'{-n,--number}'[list the revision number (default)]' \
- '(--changeset -c)'{-c,--changeset}'[list the changeset]' \
+_hgtk_cmd_annotate() {
+ _arguments -s -w : $_hgtk_global_opts \
'*:files:_hg_files'
}
-_hg_cmd_clone() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
- '(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]' \
- '(--rev -r)'{-r+,--rev}'[a changeset you would like to have after cloning]:' \
- '--uncompressed[use uncompressed transfer (fast over LAN)]' \
+_hgtk_cmd_clone() {
+ _arguments -s -w : $_hgtk_global_opts \
':source repository:_hg_remote' \
':destination:_hg_clone_dest'
}
-_hg_cmd_commit() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \
- '(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
- '(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt' \
+_hgtk_cmd_commit() {
+ _arguments -s -w : $_hgtk_global_opts \
'(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
'(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
'*:file:_hg_files'
}
-_hg_cmd_vdiff() {
+_hgtk_cmd_vdiff() {
typeset -A opt_args
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \
+ _arguments -s -w : $_hgtk_global_opts \
'*'{-r,--rev}'+[revision]:revision:_hg_revrange' \
- '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \
- '(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]' \
- '(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' \
- '(--ignore-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]' \
'*:file:->diff_files'
if [[ $state == 'diff_files' ]]
@@ -387,164 +348,53 @@ fi
}
-_hg_cmd_export() {
- _arguments -s -w : $_hg_global_opts $_hg_diff_opts \
- '(--outout -o)'{-o+,--output}'[print output to file with formatted name]:filespec:' \
- '--switch-parent[diff against the second parent]' \
- '*:revision:_hg_tags'
-}
-
-_hg_cmd_grep() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--print0 -0)'{-0,--print0}'[end filenames with NUL]' \
- '--all[print all revisions with matches]' \
- '(--follow -f)'{-f,--follow}'[follow changeset or file history]' \
- '(--ignore-case -i)'{-i,--ignore-case}'[ignore case when matching]' \
- '(--files-with-matches -l)'{-l,--files-with-matches}'[print only filenames and revs that match]' \
- '(--line-number -n)'{-n,--line-number}'[print matching line numbers]' \
- '*'{-r+,--rev}'[search in given revision range]:revision:_hg_revrange' \
- '(--user -u)'{-u,--user}'[print user who committed change]' \
- '1:search pattern:' \
+_hgtk_cmd_grep() {
+ _arguments -s -w : $_hgtk_global_opts \
'*:files:_hg_files'
}
-_hg_cmd_heads() {
- _arguments -s -w : $_hg_global_opts $_hg_style_opts \
- '(--rev -r)'{-r+,--rev}'[show only heads which are descendants of rev]:revision:_hg_tags'
+_hgtk_cmd_help() {
+ _arguments -s -w : $_hgtk_global_opts \
+ '*:hgtk command:_hgtk_commands'
}
-_hg_cmd_help() {
- _arguments -s -w : $_hg_global_opts \
- '*:hgtk command:_hg_commands'
-}
-
-_hg_cmd_incoming() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
- '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
- '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
- '(--patch -p)'{-p,--patch}'[show patch]' \
- '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
- '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
- '--bundle[file to store the bundles into]:bundle file:_files' \
- ':source:_hg_remote'
-}
-
-_hg_cmd_init() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
+_hgtk_cmd_init() {
+ _arguments -s -w : $_hgtk_global_opts \
':dir:_files -/'
}
-_hg_cmd_log() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \
- '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
- '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
- '(--copies -C)'{-C,--copies}'[show copied files]' \
- '(--keyword -k)'{-k+,--keyword}'[search for a keyword]:' \
+_hgtk_cmd_log() {
+ _arguments -s -w : $_hgtk_global_opts \
'(--limit -l)'{-l+,--limit}'[limit number of changes displayed]:' \
'*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
- '(--no-merges -M)'{-M,--no-merges}'[do not show merges]' \
- '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
- '(--patch -p)'{-p,--patch}'[show patch]' \
- '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_tags' \
'*:files:_hg_files'
}
-_hg_cmd_outgoing() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
- '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
- '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
- '(--patch -p)'{-p,--patch}'[show patch]' \
- '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
- '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
- ':destination:_hg_remote'
+_hgtk_cmd_pull() {
+ _arguments -s -w : $_hgtk_global_opts
}
-_hg_cmd_pull() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
- '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
- '(--update -u)'{-u,--update}'[update to new tip if changesets were pulled]' \
- '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \
- ':source:_hg_remote'
+_hgtk_cmd_push() {
+ _arguments -s -w : $_hgtk_global_opts
}
-_hg_cmd_push() {
- _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
- '(--force -f)'{-f,--force}'[force push]' \
- '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]:revision:_hg_tags' \
- ':destination:_hg_remote'
-}
-
-_hg_cmd_remove() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--after -A)'{-A,--after}'[record remove that has already occurred]' \
- '(--force -f)'{-f,--force}'[remove file even if modified]' \
+_hgtk_cmd_rename() {
+ _arguments -s -w : $_hgtk_global_opts \
'*:file:_hg_files'
}
-_hg_cmd_rename() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--after -A)'{-A,--after}'[record a rename that has already occurred]' \
- '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
- '*:file:_hg_files'
+_hgtk_cmd_serve() {
+ _arguments -s -w : $_hgtk_global_opts
}
-_hg_cmd_revert() {
- local context state line
- typeset -A opt_args
-
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \
- '(--rev -r)'{-r+,--rev}'[revision to revert to]:revision:_hg_tags' \
- '--no-backup[do not save backup copies of files]' \
- '*:file:->diff_files'
-
- if [[ $state == 'diff_files' ]]
- then
- if [[ -n $opt_args[-r] ]]
- then
- _hg_files
- else
- typeset -a status_files
- _hg_status mard
- _wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files
- fi
- fi
-}
-
-_hg_cmd_serve() {
- _arguments -s -w : $_hg_global_opts \
- '(--accesslog -A)'{-A+,--accesslog}'[name of access log file]:log file:_files' \
- '(--errorlog -E)'{-E+,--errorlog}'[name of error log file]:log file:_files' \
- '(--daemon -d)'{-d,--daemon}'[run server in background]' \
- '(--port -p)'{-p+,--port}'[listen port]:listen port:' \
- '(--address -a)'{-a+,--address}'[interface address]:interface address:' \
- '(--name -n)'{-n+,--name}'[name to show in web pages]:repository name:' \
- '(--templates -t)'{-t,--templates}'[web template directory]:template dir:_files -/' \
- '--style[web template style]:style' \
- '--stdio[for remote clients]' \
- '(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]'
-}
-
-_hg_cmd_status() {
- _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
- '(--all -A)'{-A,--all}'[show status of all files]' \
- '(--modified -m)'{-m,--modified}'[show only modified files]' \
- '(--added -a)'{-a,--added}'[show only added files]' \
- '(--removed -r)'{-r,--removed}'[show only removed files]' \
- '(--deleted -d)'{-d,--deleted}'[show only deleted (but tracked) files]' \
- '(--clean -c)'{-c,--clean}'[show only files without changes]' \
- '(--unknown -u)'{-u,--unknown}'[show only unknown files]' \
- '(--ignored -i)'{-i,--ignored}'[show ignored files]' \
- '(--no-status -n)'{-n,--no-status}'[hide status prefix]' \
- '(--copies -C)'{-C,--copies}'[show source of copied files]' \
- '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
+_hgtk_cmd_status() {
+ _arguments -s -w : $_hgtk_global_opts \
'--rev[show difference from revision]:revision:_hg_tags' \
'*:files:_files'
}
-_hg_cmd_update() {
- _arguments -s -w : $_hg_global_opts \
- '(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \
+_hgtk_cmd_update() {
+ _arguments -s -w : $_hgtk_global_opts \
'(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
':revision:_hg_tags'
}
|
@@ -1,14 +1,41 @@ + #
+# hgtk
+#
+# contrib/bash_completion
+#
+# Copyright 2009 Andreas Tscharner <andy@vis.ethz.ch>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
_hgtk()
{
- local cur prev opts
+ local cur prev opts cmds
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="about add annotate archive blame checkout clone commit datamine diff filter email forget grep guess hgignore history ignore init incoming log merge outgoing pull push recovery remove rename repoconfig revert rollback serve shelve status strip synch unshelve update userconfig vdiff verify version"
+ cmds="about add annotate archive blame checkout clone commit datamine diff email explorer filter forget grep guess hgignore history ignore init incoming log merge outgoing pull push recovery remove rename repoconfig revert rollback serve shelve status strip synch unshelve update userconfig vdiff verify version"
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ opts="-R --repository -v --verbose -q --quiet -h --help --debugger --nofork --fork --listfile"
+
+ if [[ ${cur} == -* ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ else
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ fi
+ return 0
}
-
complete -F _hgtk hgtk
|
|
@@ -0,0 +1,91 @@ + '''
+Binary document diff wrapper script
+
+This script is converted into an executable by py2exe for use in
+TortoiseHg binary packages. It is then used by TortoiseHg as a visual
+diff application for binary document types.
+
+It takes two (diff) or four (merge) arguments, determines the file type
+based on the file extension, then launches the appropriate document diff
+script that THG has borrowed from the TortoiseSVN project.
+
+This script is quite useless outside of a TortoiseHg binary install.
+'''
+
+import os
+import sys
+import subprocess
+import win32con
+import win32api
+import win32process
+
+from mercurial import util
+
+scripts = {
+ 'doc' : ('diff-doc.js', 'merge-doc.js'), # MS Word
+ 'docx' : ('diff-doc.js', 'merge-doc.js'),
+ 'docm' : ('diff-doc.js', 'merge-doc.js'),
+ 'ppt' : ('diff-ppt.js'), # MS PowerPoint
+ 'pptx' : ('diff-ppt.js'),
+ 'pptm' : ('diff-ppt.js'),
+ 'xls' : ('diff-xls.vbs'), # MS Excel
+ 'xlsx' : ('diff-xls.vbs'),
+ 'xlsm' : ('diff-xls.vbs'),
+ 'xlsb' : ('diff-xls.vbs'),
+ 'xlam' : ('diff-xls.vbs'),
+ 'ods' : ('diff-odt.vbs', 'merge-ods.vbs'), # OpenOffice Text
+ 'odt' : ('diff-odt.vbs', 'merge-ods.vbs'),
+ 'sxw' : ('diff-sxw.vbs', 'merge-ods.vbs'), # OpenOffice Calc
+ 'nb' : ('diff-nb.vbs'), # Mathematica Notebook
+}
+
+def main():
+ args = sys.argv[1:]
+ if len(args) not in (2, 4):
+ print 'Two or four arguments expected:'
+ print sys.argv[0], '[local] [other]'
+ print sys.argv[0], '[local] [base] [other] [output]'
+ sys.exit(1)
+ elif len(args) == 2:
+ local, other = [os.path.abspath(f) for f in args]
+ else:
+ local, base, other, output = [os.path.abspath(f) for f in args]
+
+ base, ext = os.path.splitext(local)
+ if not ext or ext.lower()[1:] not in scripts.keys():
+ print 'Unsupported file type', local
+ sys.exit(1)
+
+ proc = win32api.GetCurrentProcess()
+ try:
+ # This will fail on windows < NT
+ filename = win32process.GetModuleFileNameEx(proc, 0)
+ except:
+ filename = win32api.GetModuleFileName(0)
+ path = os.path.join(os.path.dirname(filename), 'diff-scripts')
+ if not os.path.isdir(path):
+ print 'Diff scripts not found at', path
+ sys.exit(1)
+
+ use = scripts[ext.lower()[1:]]
+ if len(args) == 2:
+ script = os.path.join(path, use[0])
+ cmd = ['wscript', script, other, local]
+ elif len(use) == 1:
+ print 'Unsupported file type for merge', local
+ sys.exit(1)
+ else:
+ script = os.path.join(path, use[1])
+ cmd = ['wscript', script, output, other, local, base]
+
+ cmd = [util.shellquote(arg) for arg in cmd]
+ cmdline = util.quotecommand(' '.join(cmd))
+ proc = subprocess.Popen(cmdline, shell=True,
+ creationflags=win32con.CREATE_NO_WINDOW,
+ stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ stdin=subprocess.PIPE)
+ return proc.communicate()
+
+if __name__=='__main__':
+ main()
|
|
|
@@ -0,0 +1,135 @@ + [merge-tools]
+; Windows version of BeyondCompare
+beyondcompare3.priority=-1
+beyondcompare3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo
+beyondcompare3.premerge=False
+beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
+beyondcompare3.regname=ExePath
+beyondcompare3.gui=True
+beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
+beyondcompare3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
+;beyondcompare3.diff3args=$parent1 $parent2 $ancestor /mergeoutput=$child /lefttitle='$plabel1' /centertitle='$alabel' /righttitle='$plabel2' /outputtitle='$clabel' /solo /expandall /ro
+beyondcompare3.dirdiff=True
+
+araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
+araxis.regappend=\ConsoleCompare.exe
+;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe
+araxis.priority=-2
+araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
+araxis.premerge=False
+araxis.checkconflict=True
+araxis.binary=True
+araxis.gui=True
+araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
+araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel" /title3:"$plabel2" $parent1 $child $parent2
+araxis.dirdiff=True
+araxis.dir3diff=True
+
+kdiff3.priority=-3
+kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
+kdiff3.regkey=Software\KDiff3
+kdiff3.regappend=\kdiff3.exe
+kdiff3.fixeol=True
+kdiff3.gui=True
+kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
+kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
+;kdiff3.diff3args=--L1 '$alabel' --L2 '$plabel1' --L3 '$plabel2' $ancestor $parent1 $parent2 -o $child
+kdiff3.dirdiff=True
+
+diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
+diffmerge.regname=Location
+diffmerge.priority=-7
+diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
+diffmerge.checkchanged=True
+diffmerge.gui=True
+diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
+diffmerge.diff3args=--nosplash --title1='$plabel1' --title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
+diffmerge.dirdiff=True
+
+p4merge.priority=-8
+p4merge.args=$base $local $other $output
+p4merge.regkey=Software\Perforce\Environment
+p4merge.regname=P4INSTROOT
+p4merge.regappend=\p4merge.exe
+p4merge.gui=True
+p4merge.diffargs=$parent $child
+p4merge.diff3args=$child $parent1 $parent2
+p4merge.dirdiff=False
+
+tortoisemerge.priority=-9
+tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
+tortoisemerge.regkey=Software\TortoiseSVN
+tortoisemerge.checkchanged=True
+tortoisemerge.gui=True
+tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
+; TortoiseMerge does not support three-way file or directory comparisons
+; This command looked like it worked, but it overwrote the merge results
+;tortoisemerge.diff3args=/base:$ancestor /mine:$parent1 /theirs:$parent2 /merged:$child /basename:'$alabel' /minename:'$plabel1' /theirsname:'$plabel2' /mergedname:'$clabel'
+
+ecmerge.priority=-10
+ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
+ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ecmerge.gui=True
+ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
+ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3 --title0='$clabel' --title1='$plabel1' --title2='$plabel2'
+ecmerge.dirdiff=True
+ecmerge.dir3diff=True
+
+winmergeu.regkey=Software\Thingamahoochie\WinMerge\
+winmergeu.regname=Executable
+winmergeu.priority=-10
+winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local $output
+winmergeu.fixeol=True
+winmergeu.checkchanged=True
+winmergeu.gui=True
+winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
+winmergeu.diff3args=
+winmergeu.dirdiff=True
+
+; TortoiseHg diff wrapper for some binary documents, not for merge general use
+docdiff.priority=-100
+docdiff.regkey=Software\TortoiseHg
+docdiff.regappend=\docdiff.exe
+docdiff.args=$local $base $other $output
+docdiff.gui=True
+docdiff.diffargs=$child $parent
+docdiff.diff3args=$parent1 $child $parent2 $child
+; These scripts fork processes, so the visual diff window must be used
+docdiff.usewin=True
+
+; Linux only diff tools, listed here for reference
+bcompare.priority=-1
+bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
+beyondcompare3.premerge=False
+bcompare.gui=True
+bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
+bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
+bcompare.dirdiff=True
+
+meld.gui=True
+meld.args=--label='local' $local --label='base' $base --label='other' $other
+meld.priority=-2
+meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
+meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
+meld.dirdiff=True
+
+diffuse.priority=-3
+diffuse.args=$local $base $other
+diffuse.gui=True
+diffuse.diffargs=$parent $child
+diffuse.diff3args=$parent1 $child $parent2
+diffuse.dirdiff=False
+
+xxdiff.priority=-4
+xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
+xxdiff.gui=True
+xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
+xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel' $child --title3 '$plabel2' $parent2
+xxdiff.dirdiff=True
+
+tkdiff.args=-L local -L other $local $other -a $base -o $output
+tkdiff.gui=True
+tkdiff.priority=-5
+tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
+tkdiff.diff3args=
+tkdiff.dirdiff=False
|
@@ -25,7 +25,7 @@ import subprocess
import urllib
-from mercurial import hg, ui, match, util
+from mercurial import hg, ui, match, util, error
from mercurial.node import short
def _thg_path():
@@ -40,7 +40,7 @@ sys.path.insert(0, thgpath)
_thg_path()
-from tortoisehg.util import paths, debugthg, hglib, cachethg
+from tortoisehg.util import paths, debugthg, cachethg
from tortoisehg.hgtk import gtklib
if debugthg.debug('N'):
@@ -107,7 +107,7 @@ return None
try:
return hg.repository(ui.ui(), path=p)
- except hglib.RepoError:
+ except error.RepoError:
return None
except StandardError, e:
debugf(e)
@@ -212,19 +212,19 @@ def get_columns(self):
return nautilus.Column("HgNautilus::80hg_status",
"hg_status",
- "HG Status",
+ "Hg Status",
"Version control status"),
def _get_file_status(self, localpath, repo=None):
cachestate = cachethg.get_state(localpath, repo)
- cache2state = {cachethg.UNCHANGED: ('default', 'clean'),
- cachethg.ADDED: ('cvs-added', 'added'),
- cachethg.MODIFIED: ('cvs-modified', 'modified'),
- cachethg.UNKNOWN: ('new', 'unrevisioned'),
- cachethg.IGNORED: (None, 'ignored'),
- cachethg.NOT_IN_REPO: (None, ''),
- cachethg.ROOT: ('generic', 'root'),
- cachethg.UNRESOLVED: ('cvs-confilict', 'unresolved')}
+ cache2state = {cachethg.UNCHANGED: ('default', 'clean'),
+ cachethg.ADDED: ('new', 'added'),
+ cachethg.MODIFIED: ('important', 'modified'),
+ cachethg.UNKNOWN: (None, 'unrevisioned'),
+ cachethg.IGNORED: ('noread', 'ignored'),
+ cachethg.NOT_IN_REPO: (None, 'unrevisioned'),
+ cachethg.ROOT: ('generic', 'root'),
+ cachethg.UNRESOLVED: ('danger', 'unresolved')}
emblem, status = cache2state.get(cachestate, (None, '?'))
return emblem, status
|
|
@@ -23,42 +23,9 @@ editor = notepad
; In order to push/pull over ssh you must specify a ssh tool
-ssh = "{app}\TortoisePlink.exe" -ssh -2
+ssh = "TortoisePlink.exe" -ssh -2
;ssh = C:\cygwin\bin\ssh
-[merge-tools]
-kdiff3.priority=-1
-kdiff3.args=-L1 base --L2 local --L3 other $base $local $other -o $output
-kdiff3.regkey=Software\KDiff3
-kdiff3.regappend=\kdiff3.exe
-kdiff3.fixeol=True
-kdiff3.gui=True
-beyondcompare3.priority=-2
-beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
-beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
-beyondcompare3.regname=ExePath
-beyondcompare3.gui=True
-diffmerge.priority=-7
-diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
-diffmerge.checkchanged=True
-diffmerge.gui=True
-p4merge.priority=-8
-p4merge.args=$base $local $other $output
-p4merge.regkey=Software\Perforce\Environment
-p4merge.regname=P4INSTROOT
-p4merge.regappend=\p4merge.exe
-p4merge.gui=True
-tortoisemerge.priority=-9
-tortoisemerge.args=/base:$output /mine:$local /theirs:$other /merged:$output
-tortoisemerge.regkey=Software\TortoiseSVN
-tortoisemerge.gui=True
-winmergeu.regkey=Software\Thingamahoochie\WinMerge\
-winmergeu.regname=Executable
-winmergeu.priority=-10
-winmergeu.args=/e /ub /dl other /dr local $other $local $output
-winmergeu.fixeol=True
-winmergeu.gui=True
-
;
; For more information about mercurial extensions, start here
; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
@@ -75,7 +42,7 @@; Warning: the color extension is not recommended for Windows
;color =
;convert =
-extdiff =
+;extdiff =
;fetch =
;gpg =
;graphlog =
@@ -101,63 +68,12 @@;fold =
;hgcr-gui =
-; To use cleverencode/cleverdecode, you must enable win32text extension
;
-; By default, we try to encode and decode all files that do not
-; contain ASCII NUL characters. What this means is that we try to set
-; line endings to Windows style on update, and to Unix style on
-; commit. This lets us cooperate with Linux and Unix users, so
-; everybody sees files with their native line endings.
-
-[encode]
-; Encode files that don't contain NUL characters.
-
-; ** = cleverencode:
-
-; Alternatively, you can explicitly specify each file extension that
-; you want encoded (any you omit will be left untouched), like this:
-
-; *.txt = dumbencode:
-
-
-[decode]
-; Decode files that don't contain NUL characters.
-
-; ** = cleverdecode:
-
-; Alternatively, you can explicitly specify each file extension that
-; you want decoded (any you omit will be left untouched), like this:
-
-; **.txt = dumbdecode:
-
-[patch]
-; If you enable win32text filtering, you will want to enable this
-; line as well to allow patching to work correctly.
-
-; eol = crlf
-
-
-;
-; Define external diff commands
+; Define external diff commands, for hg command line use only
;
[extdiff]
-cmd.vdiff = {app}\kdiff3
-opts.vdiff = $parent1 $child $parent2
-;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
-;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
-;cmd.vimdiff = gvim.exe
-;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
+;kdiff3 =
-[qct]
-;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details
-;path="C:\Program Files\qct\qct.exe"
-
-[hgk]
-;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details
-;path={app}\scripts\hgk.cmd
-;vdiff=vdiff
-
-;
; The git extended diff format will properly store binary files,
; file permission changes, and rename information that the normal
; patch format cannot cover. However it is also not 100% compatible
@@ -169,15 +85,6 @@;nodates = false
;
-; Some optional defaults
-;
-[defaults]
-;view = --limit 100
-;log = --limit 100
-;revert = --no-backup
-;log = --style=changelog
-
-;
; Keyword extension example configuration. To use, one must
; enable the keyword extension, then uncomment and modify these
; two sections. Before using the keyword extension, be sure to
|
|
@@ -0,0 +1,24 @@ + [merge-patterns]
+**.doc = docdiff
+**.docx = docdiff
+**.docm = docdiff
+**.ods = docdiff
+**.odt = docdiff
+**.sxw = docdiff
+
+[diff-patterns]
+**.doc = docdiff
+**.docx = docdiff
+**.docm = docdiff
+**.ppt = docdiff
+**.pptx = docdiff
+**.pptm = docdiff
+**.xls = docdiff
+**.xlsx = docdiff
+**.xlsm = docdiff
+**.xlsb = docdiff
+**.xlam = docdiff
+**.ods = docdiff
+**.odt = docdiff
+**.sxw = docdiff
+**.nb = docdiff
|
@@ -106,6 +106,16 @@ Root: HKCR32; Subkey: Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; Flags: uninsdeletekey; Components: shell
Root: HKCR32; Subkey: Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
+Root: HKCR; Subkey: LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu; Flags: uninsdeletekey; Components: shell
+Root: HKCR; Subkey: LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
+Root: HKCR32; Subkey: LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; Flags: uninsdeletekey; Components: shell
+Root: HKCR32; Subkey: LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
+
+Root: HKCR; Subkey: LibraryFolder\background\shellex\ContextMenuHandlers\TortoiseHgCMenu; Flags: uninsdeletekey; Components: shell
+Root: HKCR; Subkey: LibraryFolder\background\shellex\ContextMenuHandlers\TortoiseHgCMenu; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
+Root: HKCR32; Subkey: LibraryFolder\background\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; Flags: uninsdeletekey; Components: shell
+Root: HKCR32; Subkey: LibraryFolder\background\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
+
Root: HKCR; Subkey: *\shellex\ContextMenuHandlers\TortoiseHgCMenu; Flags: uninsdeletekey; Components: shell
Root: HKCR; Subkey: *\shellex\ContextMenuHandlers\TortoiseHgCMenu; ValueType: string; ValueName: ; ValueData: {{B456DB9F-7BF4-478c-937A-05130C2C212E}; Components: shell
Root: HKCR32; Subkey: *\shellex\ContextMenuHandlers\TortoiseHgCMenu; Check: Is64BitInstallMode; Flags: uninsdeletekey; Components: shell
|
@@ -1,10 +1,6 @@ [py2exe]
excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt, PyQt4.QtCode, PyQt4.QtGui
-includes=cairo, pango, pangocairo, atk, gobject, dbhash, gtk.keysyms
+includes=cairo, pango, pangocairo, atk, gobject, dbhash, gtk.keysyms, gio
packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.hgtk, tortoisehg.hgtk.logview, tortoisehg.util, iniparse, pygments, dulwich
-dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll
-
-
-[build]
-compiler=mingw32
+dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll
|
Change 1 of 5
Show Entire File
contrib/win32/tortoisehg.iss
Stacked
renamed from contrib/win32/mercurial.iss
|
||
---|---|---|
@@ -6,7 +6,7 @@ #endif
[Setup]
-AppCopyright=Copyright 2005-2009 Matt Mackall and others
+AppCopyright=Copyright 2008-2010 Steve Borho and others
AppName=TortoiseHg
AppVerName=TortoiseHg {#VERSION}
InfoAfterFile=contrib/win32/postinstall.txt
@@ -21,9 +21,9 @@OutputBaseFilename=TortoiseHg-{#VERSION}
DefaultDirName={pf}\TortoiseHg
SourceDir=..\..
-VersionInfoDescription=Mercurial distributed SCM
-VersionInfoCopyright=Copyright 2005-2009 Matt Mackall and others
-VersionInfoCompany=Matt Mackall and others
+VersionInfoDescription=TortoiseHg (with Mercurial)
+VersionInfoCopyright=Copyright 2008-2010 Steve Borho and others
+VersionInfoCompany=Steve Borho and others
InternalCompressLevel=max
SolidCompression=true
SetupIconFile=icons\thg_logo.ico
@@ -50,19 +50,17 @@Name: shell; Description: Shell integration (overlay icons, context menu) [admin required]; Types: full; Flags: restart; Check: ShellInstallPossible
[Files]
-Source: ..\build-hg\contrib\mercurial.el; DestDir: {app}/contrib
-Source: ..\build-hg\contrib\vim\*.*; DestDir: {app}/contrib/vim
-Source: ..\build-hg\contrib\zsh_completion; DestDir: {app}/contrib
-Source: ..\build-hg\contrib\hgk; DestDir: {app}/contrib
-Source: ..\build-hg\contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
-Source: ..\build-hg\templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs
-Source: ..\build-hg\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
-Source: ..\build-hg\help\*.*; DestDir: {app}\help
+Source: ..\build-hg\mercurial\help\*.txt; DestDir: {app}\help
+Source: ..\build-hg\mercurial\templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs
+Source: ..\build-hg\mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
+Source: ..\build-hg\contrib\xml.rnc; DestDir: {app}/contrib
Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n
Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Flags: ignoreversion; Components: help
Source: ..\build-hg\doc\style.css; DestDir: {app}\docs; Flags: ignoreversion; Components: help
Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall
-Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')
+Source: contrib\win32\mercurial.ini; DestDir: {app}\hgrc.d; DestName: Mercurial.rc
+Source: contrib\win32\mergepatterns.ini; DestDir: {app}\hgrc.d; DestName: MergePatterns.rc
+Source: contrib\mergetools.ini; DestDir: {app}\hgrc.d; DestName: MergeTools.rc
Source: contrib\win32\mercurialuser.ini; DestDir: {%USERPROFILE}; DestName: Mercurial.ini; AfterInstall: FileExpandStringEx('{%USERPROFILE}\Mercurial.ini'); Flags: onlyifdoesntexist
Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Source: ..\extension-versions.txt; DestDir: {app}/contrib
@@ -83,6 +81,7 @@Source: win32\*.reg; DestDir: {app}\cmenu_i18n
Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt
Source: icons\thg_logo.ico; DestDir: {app}
+Source: ..\contrib\diff-scripts\*.*; DestDir: {app}\diff-scripts
Source: ..\misc\hgbook.pdf; DestDir: {app}/docs; Flags: ignoreversion; Components: hgbook
Source: ..\misc\ThgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete; Components: shell
Source: ..\misc\ThgShellx86.dll; DestDir: {app}; DestName: ThgShellx86.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete; Components: shell
@@ -230,6 +229,9 @@ TaskbarMutex := 'thgtaskbar,Global\thgtaskbar';
tries := 0;
while (tries < 4) and CheckForMutexes(TaskbarMutex) do begin
+ TaskbarWindow := FindWindowByWindowName('TortoiseHg Overlay Icon Server');
+ if TaskbarWindow <> 0 then
+ SendMessage(TaskbarWindow, wm_Close, 0, 0);
TaskbarWindow := FindWindowByWindowName('TortoiseHg RPC server');
if TaskbarWindow <> 0 then
SendMessage(TaskbarWindow, wm_Close, 0, 0);
|
@@ -1,7 +1,8 @@ @echo off
+setlocal
-if "%hhc_compiler" equ "" (
- set hhc_compiler="%ProgramFiles%\HTML Help Workshop\hhc.exe"
+if not exist %hhc_compiler%. (
+ set hhc_compiler="%ProgramFiles%\HTML Help Workshop\hhc.exe"
)
set PDFLATEX=PdfLatex
set SPHINXBUILD=sphinx-build
@@ -58,7 +59,7 @@
if "%1" == "chm" (
%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %OUTPUTDIR%/chm
- %hhc_compiler% %OUTPUTDIR%/chm/TortoiseHG.hhp
+ %hhc_compiler% %OUTPUTDIR%/chm/TortoiseHg.hhp
echo.
echo.Build finished. The CHM file is in %OUTPUTDIR%/chm.
goto end
@@ -75,13 +76,13 @@ %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %OUTPUTDIR%/pdf
pushd .
cd %OUTPUTDIR%\pdf
- %PDFLATEX% TortoiseHG.tex
- %PDFLATEX% TortoiseHG.tex
- %PDFLATEX% TortoiseHG.tex
- makeindex -s python.ist TortoiseHG.idx
- makeindex -s python.ist modTortoiseHG.idx
- %PDFLATEX% TortoiseHG.tex
- %PDFLATEX% TortoiseHG.tex
+ %PDFLATEX% TortoiseHg.tex
+ %PDFLATEX% TortoiseHg.tex
+ %PDFLATEX% TortoiseHg.tex
+ makeindex -s python.ist TortoiseHg.idx
+ makeindex -s python.ist modTortoiseHg.idx
+ %PDFLATEX% TortoiseHg.tex
+ %PDFLATEX% TortoiseHg.tex
popd
echo.
echo.Build finished; the PDF file is in %OUTPUTDIR%/pdf.
|
|
@@ -0,0 +1,61 @@ + TortoiseHg Documentation
+
+Pro vytvoření dokumentace ve formátu HTML je potřebná instalace sphinx. V Ubuntu je sphinx balíčkem Pythonu. Ve Windows je zřejmě nejlepší easy_install. Sphinx musí být novější než 0.6.
+
+Pro vytvoření souborů PDF jsou potřebné balíčky latex. V Ubuntu to jsou 'texlive-latex-extra' a všechny jeho dependence. Ve Windows je nejlepší miktex.
+
+Jsou-li všechny potřebné rekvizity k disposici, lze použít makefile pro vytvoření cílů: html htmlhelp latex.
+
+Máme-li latex vybudován, nacédujeme se do jeho výstupního adresáře a spuštěním make all-pdf vytvoříme vlastní soubor PDF.
+
+Máme-li vybudován htmlhelp, musíme ve Windows použít jejich vlastní help compiler.
+
+Pokud ve Window nemáme žádný nástroj 'make', můžeme použít build.bat. Je-li nainstalován HTML compiler a miktex, můžeme formáty chm (build chm) a pdf (build pdf) generovat přímo.
+
+
+Hacking the source
+==================
+
+Please follow this rules when hacking the doc source files.
+
+- As suggested by Sphinx (see http://sphinx.pocoo.org/rest.html#sections)
+ use:
+
+ *************
+ Chapter title
+ *************
+
+ Section title
+ =============
+
+ Subsection title
+ ----------------
+
+ Subsubsection title
+ ^^^^^^^^^^^^^^^^^^^
+
+- To indicate a key or a combination of keys use :kbd:, for example:
+
+ :kbd:`Ctrl-A`
+
+- To indicate a label, button or anything that appears in user interfaces
+ use :guilabel:, for example:
+
+ :guilabel:`Commit`
+
+- To indicate a menu choise use :menuselection: and -->, for example:
+
+ :menuselection:`TortoiseHg... --> About`
+
+- To indicate a file use :file:, for example:
+
+ :file:`.hg/hgrc`
+
+- To indicate a command to enter into command window use :command:, for example:
+
+ :command:`hgtk log`
+
+- To indicate a text to enter into a text input field in the GUI use ``, for example:
+
+ ``myproxy:8000``
+
|
@@ -1,2 +1,8 @@ Describe path editing and [auth] hgrc section
+Finish patch page
+
Need a page explaining merges and merge undo (tie together various parts)
+
+figures/visual-diff.jpg
+new figure for p4pending
+new figure for import, email
|
|
|
@@ -0,0 +1,336 @@ + Changelog
+=========
+
+.. module:: changelog.dialog
+ :synopsis: Dialog used to view log
+
+Nástroj changelog nalezneme v kontextové nabídce pod názvem **HG Průzkumník repozitáře**. Používá se k zobrazení revizí (changesetů) repozitáře a k jejich správě. Okno procedury obsahuje přehledný graf, v němž lze vidět u každé změny vztah rodič-dítě. U každé revize lze také prohlížet změny u souborů.
+
+.. figure:: figures/log.png
+ :alt: Changelog
+
+ Prohlížeč repozitáře se skrytou nástrojovou lištou
+
+
+Stručný popis příkazů v liště hlavní nabídky:
+
+ :guilabel:`Nástroje`
+ Otevře přístup k dalším osmi příkazům TortoiseHg
+ :guilabel:`Zobrazení`
+ Přepínače viditelnosti nástrojových lišt a aktualizace pohledů
+ :guilabel:`Navigovat`
+ Nástroj pro výběr určitých changesetů v historii repozitáře
+ :guilabel:`Synchronizovat`
+ Přístup k synchronizačním funkcím
+ :guilabel:`Nápověda`
+ Přístup k otevření webového prohlížeče a informaci "O programu"
+
+Tlačítka nástrojové lišty zleva doprava (poslední tři jsou viditelné pouze při zpřístuněné extenzi MQ):
+
+ :guilabel:`Obnovit`
+ Znovu načíst historii revizí (pro komit z jiného okna, atp)
+ :guilabel:`Fronta oprávek`
+ Přepíná zobrazení panelu MQ.
+ :guilabel:`Načíst další revize`
+ Načíst do zobrazení dalších *n* revizí
+ :guilabel:`Načíst všechny revize`
+ Načíst všechny zbývající revize do zobrazení
+
+Synchronizační lišta
+---------------------
+
+.. figure:: figures/syncbar.png
+ :alt: Changelog
+
+ Synchronizační prvky v Průzkumníku repo
+
+
+Zleva doprava:
+
+ :guilabel:`Příchozí`
+ Stáhnout příchozí changesety ze vzdáleného repozitáře, uložit je v dočasném svazku a zobrazit je v náhledu. Příchozí changesety jsou v grafu revizí označeny šipkou dolů.
+ :guilabel:`Přijmout`
+ Přijmout changesety ze zobrazeného svazku. Toto tlačítko je citlivé jen po realizovaném náhledu. Nastavení "Po akci pull" je při provádění tohoto příkazu respektováno.
+ :guilabel:`Odmítnout`
+ Odmítnout zobrazené changesety. Toto tlačítko je citlivé jen po realizovaném náhledu.
+ :guilabel:`Pull`
+ Převzít příchozí changesety ze vzdáleného repozitáře, potom uplatnit nastavení "Po akci pull" (viz dále).
+ :guilabel:`Odchozí`
+ Určit odchozí changesety, které mají být odeslány do vzdáleného repozitáře. Odchozí changesety jsou označeny šipkou nahoru.
+ :guilabel:`Push`
+ Odeslat odchozí changesety do vzdáleného repozitáře.
+ :guilabel:`Email`
+ Odeslat odchozí changesety do vzdáleného repozitáře emailem.
+ :guilabel:`Stop`
+ Zastavit probíhající transakci. Tlačítko je citlivé jen u odchozích příkazů.
+
+Napravo od tlačítka Stop je rozbalovací seznam obsahující všechny nastavené cesty k jiným repozitářům. Implicitně zobrazená cesta musí být předem nastavena. Podrobnosti o stanovení URL pro vzdálené repozitáře viz `hg.1.html#urls <http://www.selenic.com/mercurial/hg.1.html#urls>`_ .
+
+Napravo od rozbalovacího seznamu je přepínač :guilabel:`Po akci pull`, v němž lze nastavit *Nic* nebo *Aktualizovat* po úkonu pull, spuštěného ze synchronizační lišty. Další volby (fetch, rebase) lze do tohoto přepínače přidat připuštěním extenze v konfiguračním souboru Mercurial.ini anebo - viz dále.
+
+Napravo od přepínače :guilabel:`After Pull` je tlačítko :guilabel:`Nastavení`. Otevírá okno pro konfiguraci repozitáře, kde na záložce :guilabel:`Sync` lze přidat další možnosti do přepínače "Po akci pull" a rovněž lze zde zadat cesty ke vzdáleným repozitářům.
+
+Changesety, přidané do repozitáře po otevření průzkumníka repozitáře, jsou v grafu označeny zelenými hvězdičkami. Týká se to posledních komitů, přijmutých changesetů a aplikovaných oprávek. Šipky a hvězdičky z gravu odstraníme použitím volby :guilabel:`Zobrazení -> Vrátit značky na původní nastavení`.
+
+Vyhledávací lišta
+-----------------
+
+.. figure:: figures/searchbar.png
+ :alt: Changelog
+
+ Prvky vyhledávací lišty
+
+Vyhledávací lišta umožňuje rychlé nastavení filtrů. Tlačítka zleva doprava (changeset = revize):
+
+ :guilabel:`Vše`
+ Zobrazit všechny changesety v repozitáři. Tato volba vlastně odstraní všechny filtry.
+ :guilabel:`Značené`
+ Zobrazit pouze changesety s tagy
+ :guilabel:`Původ`
+ Zobrazit pouze předky aktuálně vybraného changesetu.
+ :guilabel:`Rodiče`
+ Zobrazit pouze rodičovské revize pracovního adresáře.
+ Nebude-li probíhat "sloučení", bude to jenom jedna verze.
+ :guilabel:`Čela`
+ Zobrazit jen čela (heads) v repozitáři.
+ :guilabel:`Sloučení`
+ Zobrazit pouze changesety vzniklé sloučením (changesety se dvěma rodiči).
+ :guilabel:`Skrýt sloučení`
+ Zatržítko pro nezobrazování sloučených changesetů
+ :guilabel:`Větve...`
+ Výběrový seznam pojmenovaných větví v repozitáři. Jména lze nastavit v *Nastavení repozitáře -> Changelog -> Mrtvé větve*.
+
+Na konci lišty je výběrový seznam pěti různých typů filtrů.
+
+ :guilabel:`Rozsah revizí`
+ Vybrat ze seznamu zadaný rozsah revizí (m:n). Určení rozsahu revizí - viz `hg.1.html#revisions <http://www.selenic.com/mercurial/hg.1.html#revisions>`_
+ :guilabel:`Vzory souborů`
+ Prohledat seznam pro zadané jméno souboru. Určování vzorů jmen souborů - viz `hg.1.html#patterns <http://www.selenic.com/mercurial/hg.1.html#patterns>`_
+ :guilabel:`Klíčová slova`
+ Prohledat seznam pro klíčové slovo, které se porovnává s metadaty changesetů (komitent, zpráva, atp).
+ :guilabel:`Datum` Prohledat seznam pro datumový interval. Jeho určování - viz `hg.1.html#dates <http://www.selenic.com/mercurial/hg.1.html#dates>`_
+
+ :guilabel:`Uživatel`
+ Prohledat seznam pro zadaného uživatele nebo komitenta.
+
+Pro zvolený typ filtru zadáme do vedlejšího textového pole vyhledávací řetězec.
+
+
+Podrobnosti grafu
+-----------------
+
+Sloupec **Graf** ukazuje vztahy dítě-rodič pro všechny revize v historii repozitáře. Tento sloupec se rozšiřuje podle potřeby.
+
+Kontextové nabídky u revizí
+---------------------------
+
+Pravý klik na zvýrazněné revizi otevře kontextovou nabídku:
+
+ :guilabel:`Otevřít VDiff`
+ otevřít changeset v prohlížeči "VDiff"
+ :guilabel:`Zobrazit changeset`
+ otevřít changeset v diffovém prohlížeči "status"
+ :guilabel:`VDiff k aktuálnímu`
+ zobrazit změny mezi označenou revizí a aktuální revizí
+ :guilabel:`Kopírovat hash do schránky`
+ zkopírovat celý hash označené revize do schránky
+ :guilabel:`Aktualizovat`
+ aktualizovat pracovní adresář k této revizi [#rcm1]_
+ :guilabel:`Sloučit s ...`
+ sloučit vybranou revizi s aktuální [#rcm2]_
+ :guilabel:`Export oprávky`
+ generovat soubor (patch file) obsahující změny této revize
+ :guilabel:`Email oprávky`
+ poslat změny této revize emailem [#rcm3]_
+ :guilabel:`Svazek revize:tip`
+ vytvořit svazek obsahující revize od označené po "tip"
+ :guilabel:`Přidat/odebrat tag`
+ otevřít dialog pro přidání/odebrání tagu
+ :guilabel:`Odvolání revize`
+ vytvořit odvolací changeset pro vybranou revizi
+ :guilabel:`Revert`
+ vrátit obsah všech pracovních souborů k vybrané revizi bez aktualizace pracovního adresáře rodičovské revize; používat opatrně
+ :guilabel:`Archivovat revizi`
+ otevřít dialog pro archivování vybrané revize, čímž je umožněno vytvořit záložní kopii repozitáře
+ :guilabel:`Transplant to local`
+ Přenést vybranou revizi do aktuálního pracovního rodiče.
+ *Volba je viditelná jen při zpřístupněné extenzi 'transplant'*
+ :guilabel:`QImport Revision`
+ Importovat vybranou revizi do aktuální fronty vsuvek (patch queue). Platí jen pro qbase nebo vybranou čelní revizi. *Volba je viditelná jen při zpřístupněné extenzi 'MQ'*
+ :guilabel:`Odtrhnout revizi...`
+ Odstranint z repozitáře vybranou revizi a všechny její potomky [#rcm4]_. *Volba je viditelná jen při zpřistupněné extenzi 'MQ'*
+
+
+Klikneme-li pravou myší na jiném než zvýrazněném řádku, dostaneme další kontextovou nabídku příkazů, které pracují s rozsahy revizí.
+
+
+ :guilabel:`Diff odsud k vybranému`
+ Otevře okno "status" s kumulovanými změnami zadaného rozsahu changesetů. Prohlížeč umožňuje uložit vybrané porce změn do souboru.
+ :guilabel:`VDiff odsud k vybranému` [#rcm5]_
+ Otevře okno "VDiff" s kumulativními změnami zadaného rozsahu changesetů.
+ :guilabel:`Emailem odsud k vybranému`
+ Otevře vytvoření emailu pro odeslánízadaného rozsahu changesetů.
+ :guilabel:`Svazek odsud k vybranému`
+ Vytvoří soubor se svazkem zadaného rozsahu changesetů.
+ :guilabel:`Exportovat oprávky odsud k vybranému`
+ Vytvoří soubory se vsuvkami pro každý chanteset zadaného rozsahu.
+ :guilabel:`Sloučit s ...` [#rcm6]_
+ Sloučí označenou revizi s další vybranou revizí.
+ :guilabel:`Transplant revision range to local`
+ Přemístí vybraný rozsah changesetů k aktuálnímu pracovnímu rodičovskému adresáři. *Volba je viditelná jen při zpřístupněné extenzi 'transplant'*.
+ :guilabel:`Rebase on top of selected`
+ Přeskupí (rebase) vybraný changeset a předky nad původně vybranou revizi. *Volba je viditelná jen při zpřístupněné extenzi 'transplant'*.
+ :guilabel:`qimport from here to selected`
+ Importovat vybraný rozsah revizí do aktuální fronty oprávek. *Volba je viditelná jen při zpřístupněné extenzi 'MQ'*.
+ :guilabel:`Vybrat společného předka`
+ Ukáže společného předka zadaného rozsahu revizí
+
+.. [#rcm1] Otevře dialog "aktualizovat" pro danou revizi.
+.. [#rcm2] Otevře dialog "slučování" pro danou revizi.
+.. [#rcm3] Otevře vytvoření mailu s danou revizi.
+.. [#rcm4] Příkaz uloží odtržené revize ve svazku do souboru, který může být později použit. Viz `také <http://mercurial.selenic.com/wiki/EditingHistory>`_.
+.. [#rcm5] :menuselection:`Globální nastavení -> TortoiseHg -> Nástroj Visual Diff`
+.. [#rcm6] Jedna z označených revizí musí být rodič aktuálního pracovního adresáře.
+
+Kontextové nabídky u souborů
+----------------------------
+
+Pravý klik na souboru v seznamu vlevo dole otevře kontextovou nabídku dalších voleb:
+
+ :guilabel:`Vizuální Diff`
+ Pro zadaný soubor otevře nastavený nástroj "VDiff"
+ :guilabel:`VDiff k aktuálnímu`
+ Zobrazit rozdíly mezi vybranou revizí a aktuální revizí
+ :guilabel:`Otevřít revizi`
+ Otevřít revizi označeného souboru v textovém editoru [#flcm1]_
+ :guilabel:`Uložit revizi`
+ Zapsat revizi vybraného souboru do nového souboru.
+ :guilabel:`Historie souboru`
+ Ukázat revize, které upravovaly tento soubor [#flcm2]_
+ :guilabel:`Anotace souboru`
+ Otevřít soubor v proceduře "datamine"
+ :guilabel:`Vrátit obsah souboru`
+ Vrátit stav vybraného souboru do stavu označené revize [#flcm3]_
+
+.. [#flcm1] :menuselection:`Globální nastavení -> TortoiseHg -> Grafický (textový) editor`
+.. [#flcm2] Neukazuje revize smazaných souborů, neboť tato změna je pouze manifestační, která nemění historii souboru.
+.. [#flcm3] Nový obsah se projeví jako lokální změna a musí být komitován.
+
+
+Prohlížení changesetů
+---------------------
+
+Prohlížeč changesetů zobrazuje z úsporných důvodů diffy jenom jednoho souboru. Chceme-li vidět diffy všech souborů najednou,
+klikneme na řádek * [Všechny soubory].
+Prohlížeč také vypustí zobrazení nadrozměrných diffů - viz
+:menuselection:`Globální nastavení -> TortoiseHg -> Max velikost diffu`. Limit velikosti lze dočasně vypnout přepnutím volby
+:menuselection:`Zobrazení
+-> Ignorovat max velikost diffu`.
+
+Podobně jako v nástroji 'Changelog' a 'Datamine' se diffy zobrazují i v nástrojích 'Commit' a 'Shelve'. U nich se navíc pravé pole pro zobrazení diffů skládá z několika záložek.
+
+
+Analýza průvodních zpráv
+------------------------
+
+(záměrně nepřeloženo)
+
+New in TortoiseHg 0.10, the repository browser will detect and underline
+changeset hashes and bug report identifiers inside changeset messages. These
+underlined phrases are clickable links.
+
+Every word-boundary delimited string of 12 or 40 characters from the
+range [0-9a-f] is considered a changeset link. Clicking on it in the
+repository explorer will jump to the given changeset if possible.
+
+Issue tracker links are enabled when configured in the tortoisehg
+section of the configuration files. There are two keys: issue.regex
+and issue.link. The first defines the regex to match when picking up
+issue numbers, while the second defines the command to run when an
+issue number is recognized.
+
+You may include groups in issue.regex, and corresponding {n} tokens
+in issue.link (where n is a non-negative integer). {0} refers to the
+entire string matched by issue.regex, while {1} refers to the first
+group and so on. If no {n} tokens are found in issue.link, the entire
+matched string is appended instead.
+
+Examples::
+
+ BitBucket:
+ issue.regex = #(\d+)\b
+ issue.link = http://bitbucket.org/<your project and repo>/issue/{1}/
+
+ Mercurial:
+ issue.regex = \bissue\d+\b
+ issue.link = http://mercurial.selenic.com/bts/
+
+
+Klávesová navigace
+-------------------
+
+:kbd:`Ctrl-P`
+ Přesunout zvýraznění řádku na aktuální revizi pracovního adresáře
+:kbd:`Ctrl-D`
+ Aktivovat 'VDiff' pro vybraný changeset nebo soubor
+:kbd:`Ctrl-R`
+ Aktualizovat obsah repozitáře
+:kbd:`Ctrl-G`
+ Přejít k určíté revizi
+
+
+Nastavitelné parametry
+----------------------
+
+Průzkumník repozitáře má několik nastavitelných parametrů, které mohou být určeny v dialogu Nastavení ... na záložce Changelog:
+
+ :guilabel:`Zabarvení podle autora`
+ Zadáno-li true, mění se barvy changesetů podle autora
+ :guilabel:`Dlouhý souhrn`
+ Zadáno-li true, spojují se řádky zpráv komitů až do délky 80 znaků
+ :guilabel:`Velikost dávky logu`
+ Počet revizí načtených a zobrazených v prohlížeči v jedné dávce
+ :guilabel:`Kopírovat hash`
+ Zadáno-li true, lze kopírovat ID (hash) changesetů do schránky
+ :guilabel:`Mrtvé větve`
+ Seznam čárkami oddělených jmen, které mají být při sestavování seznamu jmen větví pro repozitář ignorovány
+ :guilabel:`Zabarvení větví`
+ Seznam čárkami oddělených jmen větví a barev ve formě 'branch:#XXXXXX'. Mezery a dvojtečky ve jménu větve musí být předznamenány zpětnými lomítky (\\). Podobně mohou být předznamenány i některé další znaky, např \\u0040 bude dekódováno na znak @ a \\n na 'linefeed'.
+ :guilabel:`Skrýt tagy`
+ Seznam čárkami oddělených tagů, které se nebudou zobrazovat. Užitečný příklad: zadejte "qbase, qparent, qtip" pro skrytí standardních tagů, vkládaných extenzí MQ.
+ :guilabel:`Použít expandér`
+ Zadáno-li true, zobrazují se detaily changesetu pod expandérem.
+
+Přidělení barvy jednotlivým uživatelů lze nastavit přidáním řádků do konfiguračního souboru Mercurial.ini: ::
+
+ [tortoisehg]
+ authorcolor.USERNAME = color
+
+Prohlížeč changesetů také respektuje následující volby na záložce TortoiseHg v Nastavení repozitáře:
+
+ :guilabel:`Šířka záložky`
+ Nastavení šířky záložek (v počtu míst)
+ :guilabel:`Max velikost diffu`
+ Maximální velikost diffovaného souboru
+ :guilabel:`Diff panel dole`
+ Zobrazit panel diff pod seznamem souborů
+
+
+Otevření z příkazového řádku
+----------------------------
+
+::
+
+ hgtk log [OPTIONS] [FILE]
+
+ alias: history
+
+ changelog viewer
+
+ options:
+
+ -l --limit limit number of changes displayed
+
+ globální možnosti viz "hgtk -v help log"
+
+.. vim: noet ts=4
|
|
@@ -0,0 +1,52 @@ + Klonování repozitáře
+====================
+
+.. module:: clone.dialog
+ :synopsis: Dialog used to clone a repository
+
+Pro vytvoření věrné kopie repozitáře použijeme proceduru "clone".
+V kontextové nabídce průzkumníka Windows vybereme :menuselection:`TortoiseHg -> Klonovat repo`.
+
+.. figure:: figures/clone.png
+ :alt: Clone dialog
+
+ Dialogové okno Klonovat repozitář
+
+:guilabel:`Cesta ke zdroji`
+ Cesta k repozitáři (nebo URL), který má být klonován. Pro výběr lokálního adresáře můžeme použít nástroj :guilabel:`Vyhledat...`.
+:guilabel:`Destinace`
+ Cesta k pracovnímu adresáři, do něhož má být klon uložen.
+
+Pod rozšířenou nabídkou :guilabel:`Pokročilé možnosti` nalezneme:
+
+:guilabel:`Klonovat až k revizi`
+ Můžeme omezit rozsah klonování až po zadanou revizi. Nebudou importovány ani tagy, vytvořené po této revizi.
+:guilabel:`Neaktualizovat novou pracovní složku`
+ Je-li zatrženo, bude do nového pracovního adresáře zkopírována pouze složka **.hg**. Tato volba je užitečná při vytváření centrálního nebo záložního repozitáře klonováním. Komunikaci s takovým repozitářem tvoří nástroje *push* a *pull*.
+:guilabel:`Použít protokol pull ke kopírování metadat`
+ Nachází-li se zdroj i destinace ve stejném souborovém systému, snaží se Mercurial použít pevné odkazy. Některé souborové systémy, jako např. ASF, používají pevné odkazy nesprávně ale nehlásí chybu. Tuto volbu použijeme, chceme-li se vyhnout pevným odkazům .
+:guilabel:`Použít nekomprimovaný přenos`
+ Pro použití nekomprimovaného transferu (rychlé v LAN).
+:guilabel:`Použít proxy server`
+ Pro použití proxy serveru, nastaveného v :menuselection:`TortoiseHg... -> Globální nastavení -> Proxy`.
+ Volba je použitelná jen je-li proxy server nastaven.
+:guilabel:`Vzdálený příkaz`
+ Nutno určit příkaz Mercurialu, který má být spuštěn na vzdálené straně.
+
+
+Spuštění z příkazového řádku
+----------------------------
+
+::
+
+ hgtk clone
+
+ alias: cl
+
+Skladba příkazu je ::
+
+ hgtk clone [SOURCE] [DEST]
+
+kde [SOURCE] a [DEST] jsou cesty ke zdrojovému repozitáři a k pracovní složce nového repozitáře.
+
+.. vim: noet ts=4
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
|
|
@@ -0,0 +1,105 @@ + Obecné vlastnosti
+=================
+
+.. module:: common.dialog
+ :synopsis: Common features to all the dialog
+
+Jedním z nepřeložených termínů v této dokumentaci je slovo "diff", což není pouze zkratka slova difference, ale označuje se jím standardizovaný způsob evidence změn - "unified diff".
+
+Slovo "Visual Diff" označuje nástroj pro porovnávání změn v souborech.
+
+Klávesnicové zkratky
+---------------------
+
+Je nadefinováno několik klávesnicových zkratek, které jsou podporovány všemi nástroji TortoiseHg.
+
+:kbd:`Ctrl-Q`
+ zavřít aplikaci včetně otevřených oken
+
+:kbd:`Ctrl-W`
+ zavřít aktuální okno (totéž jako :kbd:`Ctrl-Q` je-li otevřeno jen jedno okno)
+
+:kbd:`Ctrl-D`
+ zobrazit diff aktuálně vybraných souborů a revizí
+
+:kbd:`Ctrl-Enter`
+ aktivace
+
+:kbd:`F5`, :kbd:`Ctrl-R`
+ obnovit
+
+V `Mac OS X <http://bitbucket.org/tortoisehg/stable/wiki/MacOSX>`_ se místo :kbd:`Ctrl` používá jako modifikátor klávesnice "apple".
+the
+apple (command) key is used as the modifier instead of :kbd:`Ctrl`.
+
+Porovnání změn
+--------------
+
+.. figure:: figures/visual-diff.jpg
+ :alt: Visual Diff Window
+
+ Okno Přehled změn
+
+TortoiseHg 0.8 zavedl okno "Přehled změn", které je užitečné z následujících důvodů:
+
+1. Umožňuje individuální výběr vizuálního diffového nástroje pro každý jednotlivý soubor
+2. Umožňuje použití diffových nástrojů, které větví procesy na pozadí
+3. Umožňuje použití i takových vizuálních diffových nástrojů, které nepodporují diffy celých adresářů
+4. Poskytuje zpětnou vazbu, nebyly-li žádné soubory modifikovány.
+
+Pro potřebu vizualizace změn si TortoiseHg vygeneruje dočasné soubory, které obsahují starší verze dat. Tyto dočasné soubory jsou smazány při zavření aplikace "Vizuální Diff".
+
+Chceme-li vypustit otevření okna "Přehled změn" a přímo spouštět nastavený nástroj Vizuální Diff, otevřeme
+:menuselection:`TortoiseHg -> Globální nastavení` a na kartě TorotiseHg nastavíme :menuselection:`Přeskočit úvodní okno VDiff` na hodnotu "true".
+
+.. note::
+ Nastavení položky `Přeskočit úvodní okno VDiff` nemění chování nástroje VDiff, které se při spuštění z kontextového menu vždy otevře.
+
+.. warning::
+ Vypustíme-li okno "Přehled změn", musí si náš VDiff nástroj umět poradit s adresáři a nesmí
+ větvit procesy v pozadí.
+ Caveat emptor.
+
+Nastavení vizuálního diffového nástroje se v TortoiseHg provádí ve dvou krocích. Nejprve musíme nastavit příkaz
+`extdiff <http://mercurial.selenic.com/wiki/ExtdiffExtension>`_
+v konfiguračním souboru :file:`TortoiseHg/Mercurial.ini`::
+
+ [extdiff]
+ myapp = C:\Path\to\tool.exe
+
+Potom je možné vybrat `myapp` ze seznamu dostupných nástrojů "extdiff" v :menuselection:`Globální nastavení -> TortoiseHg -> Nástroj Visual Diff`.
+Nějaké konfigurační příklady lze nalézt v :doc:`faq`.
+
+Je-li nastaveno více nástrojů `extdiff`, umožní nám okno "Přehled změn" vybrat individuální nástroj pro každý soubor jednotlivě.
+
+Prohledávání stromových struktur
+--------------------------------
+
+Mnohé dialogy programu TortoiseHg používají stromových struktur k prezentaci seznamů dat uživateli. Seznamy souborů v oknech status, commit, shelve mají tvar stromových struktur.
+Většina stromových struktur je uzpůsobena pro živé vyhledávání.
+Ujistíme se, že má struktura zaměření (klikem na řádku) a začneme zapisovat vyhledávací frázi. Objeví se malé vstupní pole, které obsahuje náš zadávaný text. Zaměření (focus) se okamžitě přenese k prvnímu řádku, které odpovídá dosud zadanému textu. Dalším textem se výběr upřesňuje.
+
+V poli stromové struktury je možné také použít tyto klávesové zkratky:
+
+* :kbd:`Ctrl-F` otevře přímo vyhledávací okno
+* :kbd:`Ctrl-G` pokročí v hledání další shody
+* :kbd:`Shift-Ctrl-G` prohledává dozadu
+* Kolečko myši posunuje hledání řádků se shodou vpřed i vzad
+
+Interaktivní příkaz Mercurialu
+------------------------------
+
+Mnohé nástroje TortoiseHg používají dialog *hgcmd* k provedení příkazů, které mohou být případně interaktivní.
+
+
+.. figure:: figures/hgcmd.jpg
+ :alt: Mercurial command dialog
+
+ Interaktivní příkaz Mercurialu
+
+.. note::
+ Chybová hlášení mají pro zvýraznění červenou barvu.
+
+Je-li příkaz Mercurialu ukončen, přesune se zaměření (focus) na tlačítko :guilabel:`Close`. Proto pro zavření okna postačí stisknout tlačítko :kbd:`Enter`.
+
+.. vim: noet ts=4
|
|
|
@@ -0,0 +1,200 @@ + # -*- coding: utf-8 -*-
+#
+# thg_doc documentation build configuration file, created by
+# sphinx-quickstart on Thu Dec 03 19:01:03 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.append(os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['.templates']
+
+# The suffix of source filenames.
+source_suffix = '.txt'
+
+# The encoding of source files.
+source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'TortoiseHg'
+copyright = u'2009, Steve Borho and others'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.10'
+# The full version, including alpha/beta/rc tags.
+release = '0.10.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+language = 'cs'
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+#html_theme = 'default'
+html_style = 'default.css'
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+html_logo = 'figures/thg_logo_95x50.png'
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['.static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'TortoiseHg'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+ ('index', 'TortoiseHg.tex', ur'TortoiseHg Documentation',
+ ur'Steve Borho and others', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+latex_logo = 'figures/thg_logo_pdf.png'
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True
|
|
@@ -0,0 +1,22 @@ + ********************
+TortoiseHg prakticky
+********************
+
+.. toctree::
+ :maxdepth: 3
+
+
+ common
+ explorer
+ init
+ clone
+ commit
+ shelve
+ changelog
+ datamine
+ synchronize
+ serve
+ guess
+ ignore
+
+.. vim: noet ts=4
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
|
@@ -0,0 +1,82 @@ + Debugging
+=========
+
+.. module:: debugging
+ :synopsis: Debug problems in shell extension or dialogs
+
+Dialogy
+-------
+
+Stderr je zachycen v bufferu, který je prohlížen při ukončení programu. Je-li v bufferu nalezena jakákoliv vážná chyba (tracebacky, atp), je celý jeho obsah poslán do nástroje pro hlášení chyb a uživatel má možnost chybu hlásit. Máte-li podezření, že se vyskytly nezaznamenané chyby, můžete nastavit proměnnou prostředí **THGDEBUG** na jakoukoliv hodnotu, čímž vyřadíte ukládání stderr do bufferu.
+
+Máte-li elementární znalost Pythonu, můžete také použít::
+
+ hgtk --debugger <command>
+
+Chcete-li vyřadit dělení nástroje hgtk, můžete buď zadat proměnnou prostředí **THG_HGTK_SPAWN**, nebo přidat parametr k CLI příkazu '--nofork'.
+
+
+Windows
+~~~~~~~
+
+Pro Průzkumník repozitáře lze např. uvnitř pracovního adresáře zadat v okně :command:`cmd.exe`::
+
+ set THGDEBUG=1
+ hgtk log
+
+Linux/MacOSX
+~~~~~~~~~~~~
+
+Totéž::
+
+ export THGDEBUG=1
+ hgtk log
+
+
+
+Extenze shellu
+---------------
+
+Způsob odladění závisí na platformě.
+
+Windows
+~~~~~~~
+
+See also http://msdn.microsoft.com/en-us/library/cc144064(VS.85).aspx
+for some info bits about Running and Testing Shell Extensions on Windows
+
+The :command:`DbgView` tool from the SysInternals suite will capture
+debug messages from the shell extension.
+
+The :command:`ThgTaskbar` application's options dialog has an error
+logging tab. If you have this dialog open while you are browsing
+folders, you will get info and error level messages from the icon
+overlay refresh process.
+
+Nautilus
+~~~~~~~~
+
+Debugging is done via the environment variable DEBUG_THG
+
+* to test in a separate process::
+
+ DEBUG_THG=Ne TMPDIR=/tmp/anydir/ --no-desktop nautilus [path]
+
+* to test in the main instance::
+
+ nautilus -q
+ DEBUG_THG=NOe nautilus
+
+* permanent debugging, set DEBUG_THG in a file which is read on session
+ start (~/.profile, ~/.xprofile)
+
+Upper case characters in DEBUG_THG specify modules. Only *O* and *N*
+for *OverlayCache* and *Nautilus*, respectively, are supported module
+names. Lower case characters imply parts. Only *e* is supported,
+implying *error* messages.
+
+To restart nautilus, chose either
+
+1) killall nautilus (the session restarts nautilus automatically, stdin and stdout go to ~/.xsession-errors)
+
+2) nautilus -q; nautilus (stdin and stdout are on the console)
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
@@ -1,1 +1,1 @@ - af6eb586f1992a9d804372d2ce03328287c20ac4
\ No newline at end of file+ 5781:1c79d85d9d4c5ab659be58b2be379c77090ea75c
\ No newline at end of file |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
@@ -49,9 +49,9 @@ # built documents.
#
# The short X.Y version.
-version = '0.9'
+version = '0.10'
# The full version, including alpha/beta/rc tags.
-release = '0.9.3'
+release = '0.10.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This image was not loaded automatically because this changeset is very large.
Click to load this image...
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
Loading...