← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/win32/bzr_postinstall.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/bzr_postinstall.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 by Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""bzr postinstall helper for win32 installation
18
18
Written by Alexander Belchenko
173
173
                content[ix] = s.replace('bzr.exe',
174
174
                                        '"%s"' % os.path.join(bzr_dir,
175
175
                                                              'bzr.exe'))
176
 
            elif s.find(r'C:\Program Files\Bazaar') != -1:
177
 
                content[ix] = s.replace(r'C:\Program Files\Bazaar',
178
 
                                        bzr_dir)
179
176
 
180
177
        if dry_run:
181
178
            print "*** Write file: start_bzr.bat"
344
341
                         "this library manually and put it to directory\n"
345
342
                         "where Bzr installed.\n"
346
343
                         "For detailed instructions see:\n"
347
 
                         "http://wiki.bazaar.canonical.com/BzrOnPureWindows"
 
344
                         "http://bazaar-vcs.org/BzrOnPureWindows"
348
345
                        ),
349
346
                        "Warning",
350
347
                        MB_OK | MB_ICONEXCLAMATION)