← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
786
786
        if revision is not None:
787
787
            if b2 is not None:
788
788
                raise BzrCommandError("Can't specify -r with two branches")
789
 
            if len(revision) == 1:
 
789
            if (len(revision) == 1) or (revision[1].spec is None):
790
790
                return show_diff(tree.branch, revision[0], specific_files=file_list,
791
791
                                 external_diff_options=diff_options)
792
792
            elif len(revision) == 2:
852
852
            if file_id in basis_inv:
853
853
                continue
854
854
            path = inv.id2path(file_id)
855
 
            if not os.access(b.abspath(path), os.F_OK):
 
855
            if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
856
856
                continue
857
857
            print path
858
858
                
1961
1961
    
1962
1962
    In the future, uncommit will create a changeset, which can then
1963
1963
    be re-applied.
 
1964
 
 
1965
    TODO: jam 20060108 Add an option to allow uncommit to remove unreferenced
 
1966
              information in 'branch-as-repostory' branches.
 
1967
    TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
 
1968
              information in shared branches as well.
1964
1969
    """
1965
 
    takes_options = ['all', 'verbose', 'revision',
 
1970
    takes_options = ['verbose', 'revision',
1966
1971
                    Option('dry-run', help='Don\'t actually make changes'),
1967
1972
                    Option('force', help='Say yes to all questions.')]
1968
1973
    takes_args = ['location?']
1969
1974
    aliases = []
1970
1975
 
1971
 
    def run(self, location=None, all=False,
 
1976
    def run(self, location=None, 
1972
1977
            dry_run=False, verbose=False,
1973
1978
            revision=None, force=False):
1974
1979
        from bzrlib.branch import Branch
2005
2010
                    print 'Canceled'
2006
2011
                    return 0
2007
2012
 
2008
 
        uncommit(b, remove_files=all,
2009
 
                dry_run=dry_run, verbose=verbose,
 
2013
        uncommit(b, dry_run=dry_run, verbose=verbose,
2010
2014
                revno=revno)
2011
2015
 
2012
2016