We are currently indexing your data, so search results may be incomplete until we finish.
merge with stable
by
Changes to 6 files · Browse files at 6a4e8480cf60 Showing diff from parent 65921b53b7ed 87b760e078b5 Diff from another changeset...
|
|
|
@@ -0,0 +1,169 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>Mercurial for Windows</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+ <style type="text/css">
+ <!--
+ html {
+ font-family: sans-serif;
+ margin: 1em 2em;
+ }
+
+ p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+
+ pre {
+ margin: 0.25em 0em;
+ padding: 0.5em;
+ background-color: #EEE;
+ border: thin solid #CCC;
+ }
+
+ .indented {
+ padding-left: 10pt;
+ }
+ -->
+ </style>
+ </head>
+
+ <body>
+ <h1>Mercurial for Windows</h1>
+
+ <p>Welcome to Mercurial for Windows!</p>
+
+ <p>
+ Mercurial is a command-line application. You must run it from
+ the Windows command prompt (or if you're hard core, a <a
+ href="http://www.mingw.org/">MinGW</a> shell).
+ </p>
+
+ <p class="indented">
+ <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a>
+ msys startup script uses rxvt which has problems setting up
+ standard input and output. Running bash directly works
+ correctly.</i>
+ </p>
+
+ <p>
+ For documentation, please visit the <a
+ href="http://mercurial.selenic.com/">Mercurial web site</a>.
+ You can also download a free book, <a
+ href="http://hgbook.red-bean.com/">Mercurial: The Definitive
+ Guide</a>.
+ </p>
+
+ <p>
+ By default, Mercurial installs to <tt>C:\Program
+ Files\Mercurial</tt>. The Mercurial command is called
+ <tt>hg.exe</tt>.
+ </p>
+
+ <h1>Testing Mercurial after you've installed it</h1>
+
+ <p>
+ The easiest way to check that Mercurial is installed properly is
+ to just type the following at the command prompt:
+ </p>
+
+ <pre>
+hg
+</pre>
+
+ <p>
+ This command should print a useful help message. If it does,
+ other Mercurial commands should work fine for you.
+ </p>
+
+ <h1>Configuration notes</h1>
+ <h4>Default editor</h4>
+ <p>
+ The default editor for commit messages is 'notepad'. You can set
+ the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable
+ to specify your preference or set it in <tt>mercurial.ini</tt>:
+ </p>
+ <pre>
+[ui]
+editor = whatever
+</pre>
+
+ <h4>Configuring a Merge program</h4>
+ <p>
+ It should be emphasized that Mercurial by itself doesn't attempt
+ to do a Merge at the file level, neither does it make any
+ attempt to Resolve the conflicts.
+ </p>
+
+ <p>
+ By default, Mercurial will use the merge program defined by the
+ <tt>HGMERGE</tt> environment variable, or uses the one defined
+ in the <tt>mercurial.ini</tt> file. (see <a
+ href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a>
+ on the Mercurial Wiki for more information)
+ </p>
+
+ <h1>Reporting problems</h1>
+
+ <p>
+ Before you report any problems, please consult the <a
+ href="http://mercurial.selenic.com/">Mercurial web site</a>
+ and see if your question is already in our list of <a
+ href="http://mercurial.selenic.com/wiki/FAQ">Frequently
+ Answered Questions</a> (the "FAQ").
+ </p>
+
+ <p>
+ If you cannot find an answer to your question, please feel free
+ to send mail to the Mercurial mailing list, at <a
+ href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
+ <b>Remember</b>, the more useful information you include in your
+ report, the easier it will be for us to help you!
+ </p>
+
+ <p>
+ If you are IRC-savvy, that's usually the fastest way to get
+ help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>.
+ </p>
+
+ <h1>Author and copyright information</h1>
+
+ <p>
+ Mercurial was written by <a href="http://www.selenic.com">Matt
+ Mackall</a>, and is maintained by Matt and a team of volunteers.
+ </p>
+
+ <p>
+ The Windows installer was written by <a
+ href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
+ </p>
+
+ <p>TortoiseHg was written by
+ <a href="mailto:teekaysoh@gmail.com>">TK Soh</a>. It
+ also has it's own
+ <a href="http://bitbucket.org/tortoisehg/stable/wiki/FAQ">FAQ</a></p>
+ </p>
+
+ <p>
+ Mercurial is Copyright 2005-2009 Matt Mackall and others. See
+ the <tt>Contributors.txt</tt> file for a list of contributors.
+ </p>
+
+ <p>
+ Mercurial is free software; you can redistribute it and/or
+ modify it under the terms of the <a
+ href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
+ General Public License version 2</a> as published by the Free
+ Software Foundation.
+ </p>
+
+ <p>
+ Mercurial is distributed in the hope that it will be useful, but
+ <b>without any warranty</b>; without even the implied warranty
+ of <b>merchantability</b> or <b>fitness for a particular
+ purpose</b>. See the GNU General Public License for more
+ details.
+ </p>
+ </body>
+</html>
|
|
|
@@ -0,0 +1,38 @@ + #!/usr/bin/env python
+#
+# mercurial - scalable distributed SCM
+#
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
+import os, sys
+
+cwd = os.getcwd()
+if cwd in sys.path:
+ # Always remove current directory for Windows exe
+ if hasattr(sys, "frozen"):
+ sys.path.remove(cwd)
+ elif os.path.dirname(__file__) != cwd:
+ sys.path.remove(cwd)
+ sys.path.append(cwd)
+
+# enable importing on demand to reduce startup time
+try:
+ from mercurial import demandimport; demandimport.enable()
+except ImportError:
+ import sys
+ sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
+ ' '.join(sys.path))
+ sys.stderr.write("(check your install and PYTHONPATH)\n")
+ sys.exit(-1)
+
+import sys
+import mercurial.util
+import mercurial.dispatch
+
+for fp in (sys.stdin, sys.stdout, sys.stderr):
+ mercurial.util.set_binary(fp)
+
+mercurial.dispatch.run()
|
|
|
@@ -1,10 +1,14 @@ ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+#ifndef VERSION
+#define VERSION "snapshot"
+#endif
+
[Setup]
AppCopyright=Copyright 2005-2009 Matt Mackall and others
AppName=TortoiseHg
-AppVerName=TortoiseHg-0.8.1
+AppVerName=TortoiseHg {#Version}
InfoAfterFile=contrib/win32/postinstall.txt
LicenseFile=COPYING.txt
ShowLanguageDialog=yes
@@ -15,7 +19,7 @@AppID=TortoiseHg
AppContact=Steve Borho <steve@borho.org>
AppMutex=thgtaskbar,Global\thgtaskbar
-OutputBaseFilename=TortoiseHg-0.8.1
+OutputBaseFilename=TortoiseHg-{#Version}
DefaultDirName={pf}\TortoiseHg
SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM
@@ -23,12 +27,12 @@VersionInfoCompany=Matt Mackall and others
InternalCompressLevel=max
SolidCompression=true
-SetupIconFile=..\icons\hgicon.ico
-UninstallDisplayIcon={app}\hgicon.ico
-WizardImageFile=..\icons\install-wizard.bmp
+SetupIconFile=icons\thg_logo.ico
+UninstallDisplayIcon={app}\thg_logo.ico
+WizardImageFile=..\misc\install-wizard.bmp
WizardImageStretch=no
WizardImageBackColor=$ffffff
-WizardSmallImageFile=..\icons\install-wizard-small.bmp
+WizardSmallImageFile=..\misc\install-wizard-small.bmp
AllowNoIcons=true
DefaultGroupName=TortoiseHg
PrivilegesRequired=poweruser
@@ -37,36 +41,36 @@ArchitecturesInstallIn64BitMode=x64
[Files]
-Source: contrib\mercurial.el; DestDir: {app}/contrib
-Source: contrib\refreshicons.cmd; DestDir: {app}/contrib
-Source: contrib\vim\*.*; DestDir: {app}/contrib/vim
-Source: contrib\zsh_completion; DestDir: {app}/contrib
-Source: contrib\hgk; DestDir: {app}/contrib
-Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
+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\i18n\*.*; DestDir: {app}\i18n; Flags:
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: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt
-Source: ..\contrib\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
-Source: ..\contrib\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
+Source: ..\contrib\*.exe; DestDir: {app}; Flags: external skipifsourcedoesntexist
+Source: ..\contrib\*.dll; DestDir: {app}; Flags: external skipifsourcedoesntexist
Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays;
+Source: contrib\refreshicons.cmd; DestDir: {app}/contrib
Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete
Source: dist\library.zip; DestDir: {app}
-Source: doc\*.html; DestDir: {app}\docs
-Source: doc\*.pdf; DestDir: {app}\docs
-Source: doc\*.chm; DestDir: {app}\docs
+Source: doc\*.html; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist
+Source: doc\*.pdf; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist
+Source: doc\*.chm; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist
Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs
Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs
Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
Source: i18n\*.*; DestDir: {app}\i18n; Flags:
-Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt
-Source: ..\icons\hgicon.ico; DestDir: {app}
-Source: ..\files\hgbook.pdf; DestDir: {app}/docs
-
-Source: ..\files\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
-Source: ..\files\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
+Source: icons\thg_logo.ico; DestDir: {app}
+Source: ..\misc\hgbook.pdf; DestDir: {app}/docs
+Source: ..\misc\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
+Source: ..\misc\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete
[INI]
Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/
|
||
|
|
@@ -0,0 +1,10 @@ + Welcome to Mercurial for Windows!
+---------------------------------
+
+For configuration and usage directions, please read the ReadMe.html
+file that comes with this package.
+
+Check the TortoiseHg and Mercurial release notes at:
+
+ http://bitbucket.org/tortoisehg/stable/wiki/ReleaseNotes
+ http://mercurial.selenic.com/wiki/WhatsNew
|
|
|
@@ -354,8 +354,8 @@ e.disconnect(h)
def urlparse(self, path):
- if path.startswith('ssh://'):
- m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?$', path)
+ m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?$', path)
+ if m:
user = m.group(2)
host = m.group(3)
port = m.group(5)
|
||
|
@@ -68,7 +68,6 @@ raise
if 'py2exe' in sys.argv:
- # FIXME: quick hack to include installed hg extensions in py2exe binary
import hgext
hgextdir = os.path.dirname(hgext.__file__)
hgextmods = set(["hgext." + os.path.splitext(f)[0]
@@ -90,21 +89,22 @@ "py2exe" : {
# This is one way to ensure that hgtk can find its icons when
# running in a py2exe environment. It also makes debugging easier.
- "skip_archive" : 1,
+ "skip_archive" : 0,
# Don't pull in all this MFC stuff used by the makepy UI.
"excludes" : "pywin,pywin.dialogs,pywin.dialogs.list",
-
- # add library files to support PyGtk-based dialogs/windows
- # Note:
- # after py2exe build, copy GTK's etc and lib directories into
- # the dist directory created by py2exe.
- # also needed is the GTK's share/themes (as dist/share/themes),
- # for dialogs to display in MS-Windows XP theme.
- "includes" : includes + list(hgextmods),
+ "includes" : includes,
"optimize" : 1
}
}
+ extra['console'] = [
+ {'script':'../build-hg/hg', 'icon_resources':[(0,'icons/hg.ico')]},
+ {'script':'hgtk', 'icon_resources':[(0,'icons/thg_logo.ico')]}
+ ]
+ extra['windows'] = [
+ {'script':'thgtaskbar.py',
+ 'icon_resources':[(0,'icons/thg_logo.ico')]}
+ ]
return _scripts, _packages, _data_files, extra
|
||
Add a tag
Loading...