Hex Artifact Content
Not logged in

Artifact 4a2de34bc9e4c5cb1bd730046c26aa6e078f0e5a:

File tools/lib/fossil.tcl part of check-in [492531e3a8] - Importer extended to allow capture of exact fossil commit command by aku on 2007-09-04 22:00:31.

0000: 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  # --------------
0010: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0020: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0030: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0040: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a  ---------------.
0050: 23 20 52 65 70 6f 73 69 74 6f 72 79 20 6d 61 6e  # Repository man
0060: 61 67 65 6d 65 6e 74 20 28 46 4f 53 53 49 4c 29  agement (FOSSIL)
0070: 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ..# ------------
0080: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0090: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00c0: 2d 0a 23 20 52 65 71 75 69 72 65 6d 65 6e 74 73  -.# Requirements
00d0: 0a 0a 70 61 63 6b 61 67 65 20 72 65 71 75 69 72  ..package requir
00e0: 65 20 54 63 6c 20 38 2e 34 0a 0a 6e 61 6d 65 73  e Tcl 8.4..names
00f0: 70 61 63 65 20 65 76 61 6c 20 3a 3a 66 6f 73 73  pace eval ::foss
0100: 69 6c 20 7b 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d  il {}..# -------
0110: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0120: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0130: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0140: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0150: 2d 2d 2d 2d 2d 2d 0a 23 20 41 50 49 0a 0a 23 20  ------.# API..# 
0160: 44 65 66 69 6e 65 20 72 65 70 6f 73 69 74 6f 72  Define repositor
0170: 79 20 66 69 6c 65 2c 20 61 6e 64 20 63 6f 6e 6e  y file, and conn
0180: 65 63 74 20 74 6f 20 77 6f 72 6b 73 70 61 63 65  ect to workspace
0190: 20 69 6e 20 43 57 44 2e 0a 0a 70 72 6f 63 20 3a   in CWD...proc :
01a0: 3a 66 6f 73 73 69 6c 3a 3a 6e 65 77 20 7b 7d 20  :fossil::new {} 
01b0: 7b 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20 66  {.    variable f
01c0: 72 20 20 20 20 20 5b 66 69 6c 65 20 6e 6f 72 6d  r     [file norm
01d0: 61 6c 69 7a 65 20 5b 66 69 6c 65 75 74 69 6c 3a  alize [fileutil:
01e0: 3a 74 65 6d 70 66 69 6c 65 20 69 6d 70 6f 72 74  :tempfile import
01f0: 32 5f 66 73 6c 5f 72 70 5f 5d 5d 0a 20 20 20 20  2_fsl_rp_]].    
0200: 76 61 72 69 61 62 6c 65 20 66 6f 73 73 69 6c 0a  variable fossil.
0210: 0a 20 20 20 20 23 20 70 77 64 20 3d 20 77 6f 72  .    # pwd = wor
0220: 6b 73 70 61 63 65 0a 20 20 20 20 65 78 65 63 20  kspace.    exec 
0230: 24 66 6f 73 73 69 6c 20 6e 65 77 20 20 24 66 72  $fossil new  $fr
0240: 20 3b 20 23 20 63 72 65 61 74 65 20 61 6e 64 0a   ; # create and.
0250: 20 20 20 20 65 78 65 63 20 24 66 6f 73 73 69 6c      exec $fossil
0260: 20 6f 70 65 6e 20 24 66 72 20 3b 20 23 20 63 6f   open $fr ; # co
0270: 6e 6e 65 63 74 0a 0a 20 20 20 20 4c 6f 67 20 69  nnect..    Log i
0280: 6e 66 6f 20 22 20 20 20 20 46 6f 73 73 69 6c 3a  nfo "    Fossil:
0290: 20 20 20 20 24 66 72 22 0a 0a 20 20 20 20 72 65      $fr"..    re
02a0: 74 75 72 6e 20 24 66 72 0a 7d 0a 0a 23 20 44 65  turn $fr.}..# De
02b0: 66 69 6e 65 20 6c 6f 67 67 69 6e 67 20 63 61 6c  fine logging cal
02c0: 6c 62 61 63 6b 20 63 6f 6d 6d 61 6e 64 0a 0a 70  lback command..p
02d0: 72 6f 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a 66 65  roc ::fossil::fe
02e0: 65 64 62 61 63 6b 20 7b 6c 6f 67 63 6d 64 7d 20  edback {logcmd} 
02f0: 7b 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20 6c  {.    variable l
0300: 63 20 24 6c 6f 67 63 6d 64 0a 20 20 20 20 72 65  c $logcmd.    re
0310: 74 75 72 6e 0a 7d 0a 0a 23 20 4d 6f 76 65 20 67  turn.}..# Move g
0320: 65 6e 65 72 61 74 65 64 20 66 6f 73 73 69 6c 20  enerated fossil 
0330: 72 65 70 6f 73 69 74 6f 72 79 20 74 6f 20 66 69  repository to fi
0340: 6e 61 6c 20 64 65 73 74 69 6e 61 74 69 6f 6e 0a  nal destination.
0350: 0a 70 72 6f 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a  .proc ::fossil::
0360: 64 65 73 74 69 6e 61 74 69 6f 6e 20 7b 70 61 74  destination {pat
0370: 68 7d 20 7b 0a 20 20 20 20 76 61 72 69 61 62 6c  h} {.    variabl
0380: 65 20 66 72 0a 20 20 20 20 66 69 6c 65 20 72 65  e fr.    file re
0390: 6e 61 6d 65 20 24 66 72 20 24 70 61 74 68 0a 20  name $fr $path. 
03a0: 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 6e 61 6d     return.}..nam
03b0: 65 73 70 61 63 65 20 65 76 61 6c 20 3a 3a 66 6f  espace eval ::fo
03c0: 73 73 69 6c 20 7b 0a 20 20 20 20 23 20 52 65 70  ssil {.    # Rep
03d0: 6f 73 69 74 6f 72 79 20 66 69 6c 65 0a 20 20 20  ository file.   
03e0: 20 76 61 72 69 61 62 6c 65 20 66 72 20 7b 7d 0a   variable fr {}.
03f0: 0a 20 20 20 20 23 20 46 6f 73 73 69 6c 20 61 70  .    # Fossil ap
0400: 70 6c 69 63 61 74 69 6f 6e 0a 20 20 20 20 76 61  plication.    va
0410: 72 69 61 62 6c 65 20 66 6f 73 73 69 6c 20 5b 61  riable fossil [a
0420: 75 74 6f 5f 65 78 65 63 6f 6b 20 66 6f 73 73 69  uto_execok fossi
0430: 6c 5d 0a 0a 20 20 20 20 23 20 44 65 62 75 67 20  l]..    # Debug 
0440: 74 68 65 20 63 6f 6d 6d 69 74 20 63 6f 6d 6d 61  the commit comma
0450: 6e 64 20 28 77 72 69 74 65 20 61 20 54 63 6c 20  nd (write a Tcl 
0460: 73 63 72 69 70 74 20 63 6f 6e 74 61 69 6e 69 6e  script containin
0470: 67 20 74 68 65 0a 20 20 20 20 23 20 65 78 61 63  g the.    # exac
0480: 74 20 63 6f 6d 6d 61 6e 64 20 75 73 65 64 29 2e  t command used).
0490: 20 41 6e 64 20 74 68 65 20 66 69 6c 65 20 74 68   And the file th
04a0: 65 20 64 61 74 61 20 67 6f 65 73 20 74 6f 2e 0a  e data goes to..
04b0: 20 20 20 20 76 61 72 69 61 62 6c 65 20 64 65 62      variable deb
04c0: 75 67 63 6f 6d 6d 69 74 20 30 0a 20 20 20 20 76  ugcommit 0.    v
04d0: 61 72 69 61 62 6c 65 20 64 63 66 69 6c 65 20 20  ariable dcfile  
04e0: 20 20 20 20 7b 7d 0a 7d 0a 0a 70 72 6f 63 20 3a      {}.}..proc :
04f0: 3a 66 6f 73 73 69 6c 3a 3a 64 65 62 75 67 63 6f  :fossil::debugco
0500: 6d 6d 69 74 20 7b 66 6c 61 67 7d 20 7b 0a 20 20  mmit {flag} {.  
0510: 20 20 76 61 72 69 61 62 6c 65 20 64 65 62 75 67    variable debug
0520: 63 6f 6d 6d 69 74 20 24 66 6c 61 67 0a 20 20 20  commit $flag.   
0530: 20 69 66 20 7b 24 64 65 62 75 67 63 6f 6d 6d 69   if {$debugcommi
0540: 74 7d 20 7b 0a 09 76 61 72 69 61 62 6c 65 20 64  t} {..variable d
0550: 63 66 69 6c 65 20 5b 66 69 6c 65 20 6e 6f 72 6d  cfile [file norm
0560: 61 6c 69 7a 65 20 63 76 73 32 66 6f 73 73 69 6c  alize cvs2fossil
0570: 5f 63 6f 6d 6d 69 74 2e 74 63 6c 5d 0a 20 20 20  _commit.tcl].   
0580: 20 7d 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a   }.    return.}.
0590: 0a 70 72 6f 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a  .proc ::fossil::
05a0: 63 6f 6d 6d 69 74 20 7b 61 70 70 6e 61 6d 65 20  commit {appname 
05b0: 6e 6f 73 69 67 6e 20 6d 65 74 61 20 69 67 6e 6f  nosign meta igno
05c0: 72 65 7d 20 7b 0a 20 20 20 20 76 61 72 69 61 62  re} {.    variab
05d0: 6c 65 20 66 6f 73 73 69 6c 0a 20 20 20 20 76 61  le fossil.    va
05e0: 72 69 61 62 6c 65 20 6c 61 73 74 75 75 69 64 0a  riable lastuuid.
05f0: 20 20 20 20 76 61 72 69 61 62 6c 65 20 64 65 62      variable deb
0600: 75 67 63 6f 6d 6d 69 74 0a 20 20 20 20 76 61 72  ugcommit.    var
0610: 69 61 62 6c 65 20 64 63 66 69 6c 65 0a 0a 20 20  iable dcfile..  
0620: 20 20 23 20 43 6f 6d 6d 69 74 20 74 68 65 20 63    # Commit the c
0630: 75 72 72 65 6e 74 20 73 74 61 74 65 20 6f 66 20  urrent state of 
0640: 74 68 65 20 77 6f 72 6b 73 70 61 63 65 2e 20 53  the workspace. S
0650: 63 61 6e 20 66 6f 72 20 6e 65 77 20 61 6e 64 0a  can for new and.
0660: 20 20 20 20 23 20 72 65 6d 6f 76 65 64 20 66 69      # removed fi
0670: 6c 65 73 20 61 6e 64 20 69 73 73 75 65 20 74 68  les and issue th
0680: 65 20 61 70 70 72 6f 70 72 69 61 74 65 20 66 6f  e appropriate fo
0690: 73 73 69 6c 20 61 64 64 2f 72 6d 20 63 6f 6d 6d  ssil add/rm comm
06a0: 61 6e 64 73 0a 20 20 20 20 23 20 62 65 66 6f 72  ands.    # befor
06b0: 65 20 61 63 74 75 61 6c 6c 79 20 63 6f 6d 69 74  e actually comit
06c0: 74 69 6e 67 2e 0a 0a 20 20 20 20 23 20 4d 6f 64  ting...    # Mod
06d0: 69 66 69 65 64 2f 52 65 6d 6f 76 65 64 20 66 69  ified/Removed fi
06e0: 6c 65 73 20 66 69 72 73 74 2c 20 74 68 61 74 20  les first, that 
06f0: 77 61 79 20 74 68 65 72 65 20 77 6f 6e 27 74 20  way there won't 
0700: 62 65 20 61 6e 79 20 41 44 44 45 44 0a 20 20 20  be any ADDED.   
0710: 20 23 20 69 6e 64 69 63 61 74 6f 72 73 2e 20 4e   # indicators. N
0720: 6f 72 20 52 45 4d 4f 56 45 44 2c 20 6f 6e 6c 79  or REMOVED, only
0730: 20 45 44 49 54 45 44 2e 20 52 65 6d 6f 76 65 64   EDITED. Removed
0740: 20 66 69 6c 65 73 20 73 68 6f 77 20 75 70 20 61   files show up a
0750: 73 0a 20 20 20 20 23 20 45 44 49 54 45 44 20 77  s.    # EDITED w
0760: 68 69 6c 65 20 74 68 65 79 20 61 72 65 20 6e 6f  hile they are no
0770: 74 20 72 65 67 69 73 74 65 72 65 64 20 61 73 20  t registered as 
0780: 72 65 6d 6f 76 65 64 2e 0a 0a 20 20 20 20 73 65  removed...    se
0790: 74 20 61 64 64 65 64 20 20 20 30 0a 20 20 20 20  t added   0.    
07a0: 73 65 74 20 72 65 6d 6f 76 65 64 20 30 0a 20 20  set removed 0.  
07b0: 20 20 73 65 74 20 63 68 61 6e 67 65 64 20 30 0a    set changed 0.
07c0: 0a 20 20 20 20 66 6f 72 65 61 63 68 20 6c 69 6e  .    foreach lin
07d0: 65 20 5b 73 70 6c 69 74 20 5b 65 78 65 63 20 24  e [split [exec $
07e0: 66 6f 73 73 69 6c 20 63 68 61 6e 67 65 73 5d 20  fossil changes] 
07f0: 5c 6e 5d 20 7b 0a 09 72 65 67 73 75 62 20 7b 5e  \n] {..regsub {^
0800: 5c 73 2a 45 44 49 54 45 44 5c 73 2a 7d 20 24 6c  \s*EDITED\s*} $l
0810: 69 6e 65 20 7b 7d 20 70 61 74 68 0a 09 69 66 20  ine {} path..if 
0820: 7b 5b 49 47 4e 4f 52 45 20 24 69 67 6e 6f 72 65  {[IGNORE $ignore
0830: 20 24 70 61 74 68 5d 7d 20 63 6f 6e 74 69 6e 75   $path]} continu
0840: 65 0a 0a 09 69 66 20 7b 21 5b 66 69 6c 65 20 65  e...if {![file e
0850: 78 69 73 74 73 20 24 70 61 74 68 5d 7d 20 7b 0a  xists $path]} {.
0860: 09 20 20 20 20 65 78 65 63 20 24 66 6f 73 73 69  .    exec $fossi
0870: 6c 20 72 6d 20 24 70 61 74 68 0a 09 20 20 20 20  l rm $path..    
0880: 69 6e 63 72 20 72 65 6d 6f 76 65 64 0a 09 20 20  incr removed..  
0890: 20 20 4c 6f 67 20 69 6e 66 6f 20 22 20 20 20 20    Log info "    
08a0: 20 20 20 20 2a 2a 20 2d 20 24 70 61 74 68 22 0a      ** - $path".
08b0: 09 7d 20 65 6c 73 65 20 7b 0a 09 20 20 20 20 69  .} else {..    i
08c0: 6e 63 72 20 63 68 61 6e 67 65 64 0a 09 20 20 20  ncr changed..   
08d0: 20 4c 6f 67 20 69 6e 66 6f 20 22 20 20 20 20 20   Log info "     
08e0: 20 20 20 2a 2a 20 2a 20 24 70 61 74 68 22 0a 09     ** * $path"..
08f0: 7d 0a 20 20 20 20 7d 0a 0a 20 20 20 20 23 20 4e  }.    }..    # N
0900: 6f 77 20 6c 6f 6f 6b 20 66 6f 72 20 75 6e 72 65  ow look for unre
0910: 67 69 73 74 65 72 65 64 20 61 64 64 65 64 20 66  gistered added f
0920: 69 6c 65 73 2e 0a 0a 20 20 20 20 66 6f 72 65 61  iles...    forea
0930: 63 68 20 70 61 74 68 20 5b 73 70 6c 69 74 20 5b  ch path [split [
0940: 65 78 65 63 20 24 66 6f 73 73 69 6c 20 65 78 74  exec $fossil ext
0950: 72 61 5d 20 5c 6e 5d 20 7b 0a 09 69 66 20 7b 5b  ra] \n] {..if {[
0960: 49 47 4e 4f 52 45 20 24 69 67 6e 6f 72 65 20 24  IGNORE $ignore $
0970: 70 61 74 68 5d 7d 20 63 6f 6e 74 69 6e 75 65 0a  path]} continue.
0980: 09 65 78 65 63 20 24 66 6f 73 73 69 6c 20 61 64  .exec $fossil ad
0990: 64 20 24 70 61 74 68 0a 09 69 6e 63 72 20 61 64  d $path..incr ad
09a0: 64 65 64 0a 09 4c 6f 67 20 69 6e 66 6f 20 22 20  ded..Log info " 
09b0: 20 20 20 20 20 20 20 2a 2a 20 2b 20 24 70 61 74         ** + $pat
09c0: 68 22 0a 20 20 20 20 7d 0a 0a 20 20 20 20 23 20  h".    }..    # 
09d0: 4e 6f 77 20 63 6f 6d 6d 69 74 2c 20 75 73 69 6e  Now commit, usin
09e0: 67 20 74 68 65 20 70 72 6f 76 69 64 65 64 20 6d  g the provided m
09f0: 65 74 61 20 64 61 74 61 2c 20 61 6e 64 20 63 61  eta data, and ca
0a00: 70 74 75 72 65 20 74 68 65 20 75 75 69 64 0a 20  pture the uuid. 
0a10: 20 20 20 23 20 6f 66 20 74 68 65 20 6e 65 77 20     # of the new 
0a20: 62 61 73 65 6c 69 6e 65 2e 0a 0a 20 20 20 20 66  baseline...    f
0a30: 6f 72 65 61 63 68 20 7b 75 73 65 72 20 6d 65 73  oreach {user mes
0a40: 73 61 67 65 20 74 73 74 61 6d 70 7d 20 24 6d 65  sage tstamp} $me
0a50: 74 61 20 62 72 65 61 6b 0a 0a 20 20 20 20 73 65  ta break..    se
0a60: 74 20 6d 65 73 73 61 67 65 20 5b 6a 6f 69 6e 20  t message [join 
0a70: 5b 6c 69 73 74 20 5c 0a 09 09 09 20 20 20 22 2d  [list \....   "-
0a80: 2d 20 4f 72 69 67 69 6e 61 6c 6c 79 20 62 79 20  - Originally by 
0a90: 24 75 73 65 72 20 40 20 24 74 73 74 61 6d 70 22  $user @ $tstamp"
0aa0: 20 5c 0a 09 09 09 20 20 20 22 2d 2d 20 49 6d 70   \....   "-- Imp
0ab0: 6f 72 74 65 64 20 62 79 20 24 61 70 70 6e 61 6d  orted by $appnam
0ac0: 65 22 20 5c 0a 09 09 09 20 20 20 24 6d 65 73 73  e" \....   $mess
0ad0: 61 67 65 5d 20 5c 6e 5d 0a 0a 20 20 20 20 69 66  age] \n]..    if
0ae0: 20 7b 24 6e 6f 73 69 67 6e 7d 20 7b 0a 09 73 65   {$nosign} {..se
0af0: 74 20 63 6d 64 20 5b 6c 69 73 74 20 65 78 65 63  t cmd [list exec
0b00: 20 24 66 6f 73 73 69 6c 20 63 6f 6d 6d 69 74 20   $fossil commit 
0b10: 2d 6d 20 24 6d 65 73 73 61 67 65 20 2d 2d 6e 6f  -m $message --no
0b20: 73 69 67 6e 5d 0a 20 20 20 20 7d 20 65 6c 73 65  sign].    } else
0b30: 20 7b 0a 09 73 65 74 20 63 6d 64 20 5b 6c 69 73   {..set cmd [lis
0b40: 74 20 65 78 65 63 20 24 66 6f 73 73 69 6c 20 63  t exec $fossil c
0b50: 6f 6d 6d 69 74 20 2d 6d 20 24 6d 65 73 73 61 67  ommit -m $messag
0b60: 65 5d 0a 20 20 20 20 7d 0a 0a 20 20 20 20 69 66  e].    }..    if
0b70: 20 7b 24 64 65 62 75 67 63 6f 6d 6d 69 74 7d 20   {$debugcommit} 
0b80: 7b 0a 09 66 69 6c 65 75 74 69 6c 3a 3a 77 72 69  {..fileutil::wri
0b90: 74 65 46 69 6c 65 20 24 64 63 66 69 6c 65 20 22  teFile $dcfile "
0ba0: 5c 23 21 74 63 6c 73 68 5c 6e 24 63 6d 64 5c 6e  \#!tclsh\n$cmd\n
0bb0: 22 0a 20 20 20 20 7d 0a 0a 20 20 20 20 69 66 20  ".    }..    if 
0bc0: 7b 5b 63 61 74 63 68 20 7b 0a 09 65 76 61 6c 20  {[catch {..eval 
0bd0: 24 63 6d 64 0a 20 20 20 20 7d 20 6c 69 6e 65 5d  $cmd.    } line]
0be0: 7d 20 7b 0a 09 69 66 20 7b 21 5b 73 74 72 69 6e  } {..if {![strin
0bf0: 67 20 6d 61 74 63 68 20 22 2a 6e 6f 74 68 69 6e  g match "*nothin
0c00: 67 20 68 61 73 20 63 68 61 6e 67 65 64 2a 22 20  g has changed*" 
0c10: 24 6c 69 6e 65 5d 7d 20 7b 0a 09 20 20 20 20 72  $line]} {..    r
0c20: 65 74 75 72 6e 20 2d 63 6f 64 65 20 65 72 72 6f  eturn -code erro
0c30: 72 20 24 6c 69 6e 65 0a 09 7d 0a 0a 09 23 20 27  r $line..}...# '
0c40: 4e 6f 74 68 69 6e 67 20 63 68 61 6e 67 65 64 27  Nothing changed'
0c50: 20 63 61 6e 20 68 61 70 70 65 6e 20 66 6f 72 20   can happen for 
0c60: 63 68 61 6e 67 65 73 65 74 73 20 63 6f 6e 74 61  changesets conta
0c70: 69 6e 69 6e 67 20 6f 6e 6c 79 0a 09 23 20 64 65  ining only..# de
0c80: 61 64 2d 66 69 72 73 74 20 72 65 76 69 73 69 6f  ad-first revisio
0c90: 6e 73 20 6f 66 20 6f 6e 65 20 6f 72 20 6d 6f 72  ns of one or mor
0ca0: 65 20 66 69 6c 65 73 2e 20 46 6f 72 20 66 6f 73  e files. For fos
0cb0: 73 69 6c 20 77 65 0a 09 23 20 72 65 2d 75 73 65  sil we..# re-use
0cc0: 20 74 68 65 20 6c 61 73 74 20 62 61 73 65 6c 69   the last baseli
0cd0: 6e 65 2e 20 54 4f 44 4f 3a 20 4d 61 72 6b 20 74  ne. TODO: Mark t
0ce0: 68 65 6d 20 61 73 20 62 72 61 6e 63 68 70 6f 69  hem as branchpoi
0cf0: 6e 74 2c 0a 09 23 20 61 6e 64 20 66 6f 72 20 77  nt,..# and for w
0d00: 68 61 74 20 66 69 6c 65 2e 0a 0a 09 4c 6f 67 20  hat file....Log 
0d10: 69 6e 66 6f 20 22 20 20 20 20 20 20 20 20 55 4e  info "        UN
0d20: 43 48 41 4e 47 45 44 2c 20 6b 65 65 70 69 6e 67  CHANGED, keeping
0d30: 20 6c 61 73 74 22 0a 0a 09 72 65 74 75 72 6e 20   last"...return 
0d40: 5b 6c 69 73 74 20 24 6c 61 73 74 75 75 69 64 20  [list $lastuuid 
0d50: 30 20 30 20 30 5d 0a 20 20 20 20 7d 0a 0a 20 20  0 0 0].    }..  
0d60: 20 20 73 65 74 20 6c 69 6e 65 20 5b 73 74 72 69    set line [stri
0d70: 6e 67 20 74 72 69 6d 20 24 6c 69 6e 65 5d 0a 20  ng trim $line]. 
0d80: 20 20 20 72 65 67 73 75 62 20 2d 6e 6f 63 61 73     regsub -nocas
0d90: 65 20 2d 2d 20 7b 5e 5c 73 2a 4e 65 77 5f 56 65  e -- {^\s*New_Ve
0da0: 72 73 69 6f 6e 3a 5c 73 2a 7d 20 24 6c 69 6e 65  rsion:\s*} $line
0db0: 20 7b 7d 20 75 75 69 64 0a 0a 20 20 20 20 73 65   {} uuid..    se
0dc0: 74 20 6c 61 73 74 75 75 69 64 20 24 75 75 69 64  t lastuuid $uuid
0dd0: 0a 20 20 20 20 72 65 74 75 72 6e 20 5b 6c 69 73  .    return [lis
0de0: 74 20 24 75 75 69 64 20 24 61 64 64 65 64 20 24  t $uuid $added $
0df0: 72 65 6d 6f 76 65 64 20 24 63 68 61 6e 67 65 64  removed $changed
0e00: 5d 0a 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d  ].}..# ---------
0e10: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e20: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e30: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e40: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e50: 2d 2d 2d 2d 0a 23 20 49 6e 74 65 72 6e 61 6c 20  ----.# Internal 
0e60: 68 65 6c 70 65 72 20 63 6f 6d 6d 61 6e 64 73 0a  helper commands.
0e70: 0a 70 72 6f 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a  .proc ::fossil::
0e80: 49 47 4e 4f 52 45 20 7b 69 67 6e 6f 72 65 20 70  IGNORE {ignore p
0e90: 61 74 68 7d 20 7b 0a 20 20 20 20 72 65 74 75 72  ath} {.    retur
0ea0: 6e 20 5b 75 70 6c 65 76 65 6c 20 23 30 20 5b 6c  n [uplevel #0 [l
0eb0: 69 6e 73 65 72 74 20 24 69 67 6e 6f 72 65 20 65  insert $ignore e
0ec0: 6e 64 20 24 70 61 74 68 5d 5d 0a 7d 0a 0a 70 72  nd $path]].}..pr
0ed0: 6f 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a 4c 6f 67  oc ::fossil::Log
0ee0: 20 7b 6c 65 76 65 6c 20 74 65 78 74 7d 20 7b 0a   {level text} {.
0ef0: 20 20 20 20 76 61 72 69 61 62 6c 65 20 6c 63 0a      variable lc.
0f00: 20 20 20 20 75 70 6c 65 76 65 6c 20 23 30 20 5b      uplevel #0 [
0f10: 6c 69 6e 73 65 72 74 20 24 6c 63 20 65 6e 64 20  linsert $lc end 
0f20: 24 6c 65 76 65 6c 20 24 74 65 78 74 5d 0a 20 20  $level $text].  
0f30: 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 70 72 6f 63    return.}..proc
0f40: 20 3a 3a 66 6f 73 73 69 6c 3a 3a 4e 6f 70 20 7b   ::fossil::Nop {
0f50: 61 72 67 73 7d 20 7b 7d 0a 0a 6e 61 6d 65 73 70  args} {}..namesp
0f60: 61 63 65 20 65 76 61 6c 20 3a 3a 66 6f 73 73 69  ace eval ::fossi
0f70: 6c 20 7b 0a 20 20 20 20 23 20 4c 6f 67 67 69 6e  l {.    # Loggin
0f80: 67 20 63 61 6c 6c 62 61 63 6b 2e 20 4e 6f 20 6c  g callback. No l
0f90: 6f 67 67 69 6e 67 20 62 79 20 64 65 66 61 75 6c  ogging by defaul
0fa0: 74 2e 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20  t..    variable 
0fb0: 6c 63 20 3a 3a 66 6f 73 73 69 6c 3a 3a 4e 6f 70  lc ::fossil::Nop
0fc0: 0a 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  .}..# ----------
0fd0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0fe0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ff0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
1000: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
1010: 2d 2d 2d 0a 23 20 52 65 61 64 79 0a 0a 70 61 63  ---.# Ready..pac
1020: 6b 61 67 65 20 70 72 6f 76 69 64 65 20 66 6f 73  kage provide fos
1030: 73 69 6c 20 31 2e 30 0a 72 65 74 75 72 6e 0a     sil 1.0.return.