- Timestamp:
- 2011-11-06T22:21:05Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 898e847
- Parents:
- 2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- contrib
- Files:
-
- 2 deleted
- 7 edited
-
arch/uspace/srv/vfs/vfs.adl (modified) (2 diffs)
-
bazaar/bzreml/__init__.py (modified) (4 diffs)
-
bazaar/bzreml/setup.py (modified) (1 diff)
-
conf/arm32-qe.sh (modified) (1 diff)
-
conf/ia32-qe.sh (modified) (1 diff)
-
conf/net-qe.bat (deleted)
-
conf/ppc32-qe.sh (modified) (1 diff)
-
tools/gen_vga323.c (modified) (1 diff)
-
tools/serengeti_silo.sh (deleted)
Legend:
- Unmodified
- Added
- Removed
-
contrib/arch/uspace/srv/vfs/vfs.adl
r2bdf8313 rb0f00a9 4 4 5 5 /* Mount filesystem */ 6 sysarg_t mount(in sysarg_t device, in sysarg_t flags, in _copy string point, in_copy string opts, in_copy string fs);6 sysarg_t mount(in sysarg_t device, in sysarg_t flags, in sysarg_t instance, in_copy string point, in_copy string opts, in_copy string fs); 7 7 8 8 /* Open file */ … … 56 56 57 57 /* Mount filesystem */ 58 sysarg_t mount(in sysarg_t device, in sysarg_t flags, in _copy string point, in_copy string opts, ...);58 sysarg_t mount(in sysarg_t device, in sysarg_t flags, in sysarg_t instance, in_copy string point, in_copy string opts, ...); 59 59 60 60 /* Open file by node */ -
contrib/bazaar/bzreml/__init__.py
r2bdf8313 rb0f00a9 134 134 body.write("New Revision: %s%s\n" % (revision_ac_no, merge_marker(revision_ac))) 135 135 body.write("New Id: %s\n" % revision_ac_id) 136 137 body.write("\n")138 139 136 for parent_id in revision_ac.parent_ids: 140 137 body.write("Parent: %s\n" % parent_id) 141 142 tree_old = branch.repository.revision_tree(parent_id) 143 tree_ac = branch.repository.revision_tree(revision_ac_id) 144 145 delta = tree_ac.changes_from(tree_old) 146 147 if (len(delta.added) > 0): 148 body.write("Added:\n") 149 for item in delta.added: 150 body.write(" %s\n" % item[0]) 151 152 if (len(delta.removed) > 0): 153 body.write("Removed:\n") 154 for item in delta.removed: 155 body.write(" %s\n" % item[0]) 156 157 if (len(delta.renamed) > 0): 158 body.write("Renamed:\n") 159 for item in delta.renamed: 160 body.write(" %s -> %s\n" % (item[0], item[1])) 161 162 if (len(delta.kind_changed) > 0): 163 body.write("Changed:\n") 164 for item in delta.kind_changed: 165 body.write(" %s\n" % item[0]) 166 167 if (len(delta.modified) > 0): 168 body.write("Modified:\n") 169 for item in delta.modified: 170 body.write(" %s\n" % item[0]) 171 172 body.write("\n") 173 138 139 body.write("\n") 140 141 commit_message = "" 174 142 body.write("Log:\n") 175 143 if (not revision_ac.message): … … 179 147 for line in log.split("\n"): 180 148 body.write("%s\n" % line) 149 if (commit_message == ""): 150 commit_message = line 151 152 if (commit_message == ""): 153 commit_message = "(empty)" 181 154 182 155 body.write("\n") … … 184 157 tree_old = branch.repository.revision_tree(revision_old_id) 185 158 tree_new = branch.repository.revision_tree(revision_new_id) 159 160 revision_new_no = branch.revision_id_to_revno(revision_new_id) 161 delta = tree_new.changes_from(tree_old) 162 163 if (len(delta.added) > 0): 164 body.write("Added:\n") 165 for item in delta.added: 166 body.write(" %s\n" % item[0]) 167 168 if (len(delta.removed) > 0): 169 body.write("Removed:\n") 170 for item in delta.removed: 171 body.write(" %s\n" % item[0]) 172 173 if (len(delta.renamed) > 0): 174 body.write("Renamed:\n") 175 for item in delta.renamed: 176 body.write(" %s -> %s\n" % (item[0], item[1])) 177 178 if (len(delta.kind_changed) > 0): 179 body.write("Changed:\n") 180 for item in delta.kind_changed: 181 body.write(" %s\n" % item[0]) 182 183 if (len(delta.modified) > 0): 184 body.write("Modified:\n") 185 for item in delta.modified: 186 body.write(" %s\n" % item[0]) 187 188 body.write("\n") 186 189 187 190 tree_old.lock_read() … … 196 199 tree_old.unlock() 197 200 198 revision_new_no = branch.revision_id_to_revno(revision_new_id) 199 200 delta = tree_new.changes_from(tree_old) 201 files = [] 202 203 for item in delta.added: 204 files.append(item[0]) 205 206 for item in delta.removed: 207 files.append(item[0]) 208 209 for item in delta.renamed: 210 files.append(item[0]) 211 212 for item in delta.kind_changed: 213 files.append(item[0]) 214 215 for item in delta.modified: 216 files.append(item[0]) 217 218 subject = "r%d - %s" % (revision_new_no, " ".join(files)) 201 subject = "r%d - %s" % (revision_new_no, commit_message) 219 202 220 203 send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue()) -
contrib/bazaar/bzreml/setup.py
r2bdf8313 rb0f00a9 7 7 description = 'Commit email plugin for Bazaar', 8 8 keywords = 'plugin bzr email', 9 version = '1. 0',9 version = '1.2', 10 10 url = 'http://www.decky.cz/', 11 11 license = 'BSD', -
contrib/conf/arm32-qe.sh
r2bdf8313 rb0f00a9 1 1 #!/bin/sh 2 2 3 qemu-system-arm -M integratorcp --kernel image.boot3 qemu-system-arm $@ -M integratorcp --kernel image.boot -
contrib/conf/ia32-qe.sh
r2bdf8313 rb0f00a9 8 8 fi 9 9 10 qemu -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d10 qemu $@ -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d -
contrib/conf/ppc32-qe.sh
r2bdf8313 rb0f00a9 1 1 #!/bin/sh 2 2 3 qemu-system-ppc -M mac99-boot d -cdrom image.iso3 qemu-system-ppc $@ -M g3beige -boot d -cdrom image.iso -
contrib/tools/gen_vga323.c
r2bdf8313 rb0f00a9 33 33 #define BLUE(i) ((i) & ((1 << 3) - 1)) 34 34 35 int main(int argc, char *argv[]) { 35 int main(int argc, char *argv[]) 36 { 36 37 unsigned int i; 37 38
Note:
See TracChangeset
for help on using the changeset viewer.
