← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
33
33
    delta,
34
34
    config,
35
35
    errors,
 
36
    globbing,
36
37
    ignores,
37
38
    log,
38
39
    merge as _mod_merge,
1831
1832
        if not name_pattern_list:
1832
1833
            raise errors.BzrCommandError("ignore requires at least one "
1833
1834
                                  "NAME_PATTERN or --old-default-rules")
 
1835
        name_pattern_list = [globbing.normalize_pattern(p) 
 
1836
                             for p in name_pattern_list]
1834
1837
        for name_pattern in name_pattern_list:
1835
 
            if name_pattern[0] == '/':
 
1838
            if (name_pattern[0] == '/' or 
 
1839
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
1836
1840
                raise errors.BzrCommandError(
1837
1841
                    "NAME_PATTERN should not be an absolute path")
1838
1842
        tree, relpath = WorkingTree.open_containing(u'.')
1852
1856
        if igns and igns[-1] != '\n':
1853
1857
            igns += '\n'
1854
1858
        for name_pattern in name_pattern_list:
1855
 
            igns += name_pattern.rstrip('/') + '\n'
 
1859
            igns += name_pattern + '\n'
1856
1860
 
1857
1861
        f = AtomicFile(ifn, 'wb')
1858
1862
        try: